Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> writes:
> Plus, option_with_implicit_dot is used in cut-and-paste ready commands
> below.
I do not think we should aim for easy cut-and-paste, especially when
the real purpose of the change is to train people's fingers; the
message should discouraging cut-and-paste in a case like this, if
anything.
But we could obviously do this, if you really want to cut-and-paste.
builtin/add.c | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/builtin/add.c b/builtin/add.c
index 7552f7f..ba72a57 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -363,7 +363,7 @@ static int add_files(struct dir_struct *dir, int flags)
return exit_status;
}
-static void warn_pathless_add(const char *option_name) {
+static void warn_pathless_add(const char *option_name, const char *short_name) {
/*
* To be consistent with "git add -p" and most Git
* commands, we should default to being tree-wide, but
@@ -374,20 +374,21 @@ static void warn_pathless_add(const char *option_name) {
* turned into a die(...), and eventually we may
* reallow the command with a new behavior.
*/
- warning(_("The behavior of 'git add %s' with no path argument from a subdirectory of the\n"
- "tree will change in Git 2.0 and shouldn't be used anymore.\n"
+ warning(_("The behavior of 'git add %s (or %s)' with no path argument from a\n"
+ "subdirectory of the tree will change in Git 2.0 and should not be\n"
+ "used anymore.\n"
"To add content for the whole tree, run:\n"
"\n"
- " git add %s :/\n"
+ " git add %s :/ ;# or git add %s :/\n"
"\n"
"To restrict the command to the current directory, run:\n"
"\n"
- " git add %s .\n"
+ " git add %s . ;# or git add %s .\n"
"\n"
"With the current Git version, the command is restricted to the current directory."),
- option_name,
- option_name,
- option_name);
+ option_name, short_name,
+ option_name, short_name,
+ option_name, short_name);
}
int cmd_add(int argc, const char **argv, const char *prefix)
@@ -401,6 +402,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
int require_pathspec;
char *seen = NULL;
const char *option_with_implicit_dot = NULL;
+ const char *short_option_with_implicit_dot = NULL;
git_config(add_config, NULL);
@@ -420,14 +422,19 @@ 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)
+ if (addremove) {
option_with_implicit_dot = "--all";
- if (take_worktree_changes)
+ short_option_with_implicit_dot = "-A";
+ }
+ if (take_worktree_changes) {
option_with_implicit_dot = "--update";
+ short_option_with_implicit_dot = "-u";
+ }
if (option_with_implicit_dot && !argc) {
static const char *here[2] = { ".", NULL };
if (prefix)
- warn_pathless_add(option_with_implicit_dot);
+ warn_pathless_add(option_with_implicit_dot,
+ short_option_with_implicit_dot);
argc = 1;
argv = here;
}
--
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