[PATCH 1/2] git add: --ignore-removal is a better named --no-all
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 22, 2013, 20:43 UTC
- Message-ID
- <1366663435-13598-2-git-send-email-gitster@pobox.com>
- In-Reply-To
- <1366663435-13598-1-git-send-email-gitster@pobox.com>
In the historical context of "git add --all ." that tells the command to pay attention to "all kinds of changes" (implying "without ignoring removals"), the option "--no-all" to countermand it may have made some sense, but because we will be making "--all" the default when a pathspec is given, it makes more sense to rename the option to a more explicit "--ignore-removal". The "-all" option naturally becomes its negation: "--no-ignore-removal".
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- Documentation/git-add.txt | 10 ++++++---- builtin/add.c | 11 +++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 5c501a2..48754cb 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -9,9 +9,9 @@ SYNOPSIS -------- [verse] 'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p] - [--edit | -e] [--[no-]all | [--update | -u]] [--intent-to-add | -N] - [--refresh] [--ignore-errors] [--ignore-missing] [--] - [<pathspec>...] + [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]] + [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] + [--] [<pathspec>...] DESCRIPTION ----------- @@ -111,6 +111,7 @@ of Git, hence the form without <pathspec> should not be used. -A:: --all:: +--no-ignore-removal:: Update the index not only where the working tree has a file matching <pathspec> but also where the index already has an entry. This adds, modifies, and removes index entries to @@ -122,6 +123,7 @@ and its subdirectories. This default will change in a future version of Git, hence the form without <pathspec> should not be used. --no-all:: +--ignore-removal:: Update the index by adding new files that are unknown to the index and files modified in the working tree, but ignore files that have been removed from the working tree. This @@ -130,7 +132,7 @@ of Git, hence the form without <pathspec> should not be used. This option is primarily to help the current users of Git, whose "git add <pathspec>..." ignores removed files. In future versions of Git, "git add <pathspec>..." will be a synonym to "git add -A -<pathspec>..." and "git add --no-all <pathspec>..." will behave like +<pathspec>..." and "git add --ignore-removal <pathspec>..." will behave like today's "git add <pathspec>...", ignoring removed files. -N:: diff --git a/builtin/add.c b/builtin/add.c index 54cd2d4..aefbc45 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -382,6 +382,13 @@ static int ignore_add_errors, intent_to_add, ignore_missing; static int addremove = ADDREMOVE_DEFAULT; static int addremove_explicit = -1; /* unspecified */ +static int ignore_removal_cb(const struct option *opt, const char *arg, int unset) +{ + /* if we are told to ignore, we are not adding removals */ + *(int *)opt->value = !unset ? 0 : 1; + return 0; +} + static struct option builtin_add_options[] = { OPT__DRY_RUN(&show_only, N_("dry run")), OPT__VERBOSE(&verbose, N_("be verbose")), @@ -393,6 +400,10 @@ static struct option builtin_add_options[] = { OPT_BOOL('u', "update", &take_worktree_changes, N_("update tracked files")), OPT_BOOL('N', "intent-to-add", &intent_to_add, N_("record only the fact that the path will be added later")), OPT_BOOL('A', "all", &addremove_explicit, N_("add changes from all tracked and untracked files")), + { OPTION_CALLBACK, 0, "ignore-removal", &addremove_explicit, + NULL /* takes no arguments */, + N_("ignore paths removed in the working tree (same as --no-all)"), + PARSE_OPT_NOARG, ignore_removal_cb }, OPT_BOOL( 0 , "refresh", &refresh_only, N_("don't add, only refresh the index")), OPT_BOOL( 0 , "ignore-errors", &ignore_add_errors, N_("just skip files which cannot be added because of errors")), OPT_BOOL( 0 , "ignore-missing", &ignore_missing, N_("check if - even missing - files are ignored in dry run")),
-- 1.8.2.1-683-g39c426e