Matthieu Moy venit, vidit, dixit 28.01.2013 10:16:
> Most git commands that can be used with our without a filepattern are
> tree-wide by default, the filepattern being used to restrict their scope.
> A few exceptions are: 'git grep', 'git clean', 'git add -u' and 'git add -A'.
Since I didn't follow this thread, my first reaction was: "Huh? Aren't
they treewide?" (for the relative tree)
So, for someone reading just the commit message, it would be helpful to
say what the others do, i.e. default to the relative tree at pwd (rather
than defaulting to an empty tree, or all files whether tracked or not,
or...).
Otherwise, I'd rather switch sooner than later; it's so easy to take
"git add -u && git commit == git commit -a" for granted and to miss
staging some hunks. But 2.0 is around the corner anyway, isn't it ;)
> The inconsistency of 'git add -u' and 'git add -A' are particularly
> problematic since other 'git add' subcommands (namely 'git add -p' and
> 'git add -e') are tree-wide by default.
>
> Flipping the default now is unacceptable, so this patch starts training
> users to type explicitely 'git add -u|-A :/' or 'git add -u|-A .', to prepare
> for the next steps:
>
> * forbid 'git add -u|-A' without filepattern (like 'git add' without
> option)
>
> * much later, maybe, re-allow 'git add -u|-A' without filepattern, with a
> tree-wide scope.
>
> A nice side effect of this patch is that it makes the :/ special
> filepattern easier to discover for users.
>
> When the command is called from the root of the tree, there is no
> ambiguity and no need to change the behavior, hence no need to warn.
>
> Signed-off-by: Matthieu Moy <matthieu....@imag.fr>
> ---
> Changes since v2:
>
> * Typo consistant -> consistent
>
> * Mention both short and long option names (Thanks Junio). I went for
> a two-lines display which I find a bit nicer to read than Junio's
> version, but I'm fine with both.
>
> Documentation/git-add.txt | 7 ++++---
> builtin/add.c | 44 +++++++++++++++++++++++++++++++++++++++++++-
> 2 files changed, 47 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
> index fd9e36b..5333559 100644
> --- a/Documentation/git-add.txt
> +++ b/Documentation/git-add.txt
> @@ -107,9 +107,10 @@ apply to the index. See EDITING PATCHES below.
> from the index if the corresponding files in the working tree
> have been removed.
> +
> -If no <filepattern> is given, default to "."; in other words,
> -update all tracked files in the current directory and its
> -subdirectories.
> +If no <filepattern> is given, the current version of Git defaults to
> +"."; in other words, update all tracked files in the current directory
> +and its subdirectories. This default will change in a future version
> +of Git, hence the form without <filepattern> should not be used.
>
> -A::
> --all::
> diff --git a/builtin/add.c b/builtin/add.c
> index 7cb6cca..7738025 100644
> --- a/builtin/add.c
> +++ b/builtin/add.c
> @@ -321,6 +321,35 @@ static int add_files(struct dir_struct *dir, int flags)
> return exit_status;
> }
>
> +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
> + * this is not the original behavior and can't be
> + * changed until users trained themselves not to type
> + * "git add -u" or "git add -A". For now, we warn and
> + * keep the old behavior. Later, this warning can be
> + * turned into a die(...), and eventually we may
> + * reallow the command with a new behavior.
> + */
> + 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 used anymore.\n"
> + "To add content for the whole tree, run:\n"
> + "\n"
> + " git add %s :/\n"
> + " (or git add %s :/)\n"
> + "\n"
> + "To restrict the command to the current directory, run:\n"
> + "\n"
> + " git add %s .\n"
> + " (or git add %s .)\n"
> + "\n"
> + "With the current Git version, the command is restricted to
> the current directory."),
> + option_name, short_name,
> + option_name, short_name,
> + option_name, short_name);
> +}
> +
> int cmd_add(int argc, const char **argv, const char *prefix)
> {
> int exit_status = 0;
> @@ -331,6 +360,8 @@ int cmd_add(int argc, const char **argv, const char
> *prefix)
> int add_new_files;
> 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);
>
> @@ -350,8 +381,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 || take_worktree_changes) && !argc) {
> + if (addremove) {
> + option_with_implicit_dot = "--all";
> + 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,
> + 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 majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
