Flip the default behaviour when "git add -u/-A" is run without a
pathspec from a subdirectory to tree-wide, and reword the advice
message.
We will need to keep the advice message for a while to help people
who skipped the 1.8.0 boundary.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
builtin/add.c | 8 ++++----
t/t2200-add-update.sh | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/add.c b/builtin/add.c
index f58d1cf..6e6cdc0 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -360,13 +360,13 @@ static int add_files(struct dir_struct *dir, int flags)
}
static const char *warn_add_uA_180_migration_msg[] = {
- "In release 1.8.0, running 'git add -u' (or 'git add -A') from",
- "a subdirectory without giving any pathspec WILL take effect",
+ "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.",
+ "on the whole working tree, if you want to be explicit.",
};
static int warn_180_migration(void)
@@ -374,7 +374,7 @@ 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 0; /* default to "no" (not tree-wide, i.e. local) */
+ return 1; /* default to "true" (tree-wide, i.e. not local) */
}
int cmd_add(int argc, const char **argv, const char *prefix)
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index f7711ba..a601394 100755
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -91,7 +91,7 @@ test_expect_success 'update from a subdirectory without pathspec' '
git add -u 2>../expect.warning
) &&
git diff-files --name-only dir1 check >actual &&
- echo check >expect &&
+ : >expect &&
test_cmp expect actual &&
grep warning expect.warning
'
--
1.7.5.rc1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html