[PATCH 4/4] add: make "add -u/-A" update full tree without pathspec (step 3)
STALE3760d
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:50:59
Subsystem:
the rest · Maintainer:
Linus Torvalds
Now long after 1.8.0 happened, people should have got used to the new default behaviour and it is no longer necessary to give the migration advice anymore. Signed-off-by: Junio C Hamano <redacted> --- builtin/add.c | 23 +---------------------- t/t2200-add-update.sh | 4 +--- 2 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/builtin/add.c b/builtin/add.c
index 6e6cdc0..3564d7e 100644
--- a/builtin/add.c
+++ b/builtin/add.c@@ -359,24 +359,6 @@ static int add_files(struct dir_struct *dir, int flags) return exit_status; } -static const char *warn_add_uA_180_migration_msg[] = { - "Since release 1.8.0, running 'git add -u' (or 'git add -A')", - "from a subdirectory without giving any pathspec takes effect", - "on the whole working tree, not just the part under the current", - "directory. Please make it a habit to add '.' when you want to", - "limit the operation to the current directory and below.", - "You can use ':/' at the end of the command to affect the operation", - "on the whole working tree, if you want to be explicit.", -}; - -static int warn_180_migration(void) -{ - int i; - for (i = 0; i < ARRAY_SIZE(warn_add_uA_180_migration_msg); i++) - warning("%s", warn_add_uA_180_migration_msg[i]); - return 1; /* default to "true" (tree-wide, i.e. not local) */ -} - int cmd_add(int argc, const char **argv, const char *prefix) { int exit_status = 0;
@@ -407,11 +389,8 @@ int cmd_add(int argc, const char **argv, const char *prefix) die("-A and -u are mutually incompatible"); if (!show_only && ignore_missing) die("Option --ignore-missing can only be used together with --dry-run"); - if ((addremove || take_worktree_changes) && !argc) { + if ((addremove || take_worktree_changes) && !argc) whole_tree_add = 1; - if (prefix) - whole_tree_add = warn_180_migration(); - } add_new_files = !take_worktree_changes && !refresh_only; require_pathspec = !take_worktree_changes;
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index a601394..3ad6bff 100755
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh@@ -81,8 +81,6 @@ test_expect_success 'change gets noticed' ' ' test_expect_success 'update from a subdirectory without pathspec' ' - # This test needs to be updated to expect the whole tree - # update after 1.8.0 migration. test_might_fail git reset check dir1 && echo changed >check && (
@@ -93,7 +91,7 @@ test_expect_success 'update from a subdirectory without pathspec' ' git diff-files --name-only dir1 check >actual && : >expect && test_cmp expect actual && - grep warning expect.warning + ! grep warning expect.warning ' test_expect_success 'update from a subdirectory with local pathspec' '
--
1.7.5.rc1