[PATCH] git-add: allow --ignore-missing always, not just in dry run
From: Dieter Plaetinck <hidden>
Date: 2016-06-15 22:52:49
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
There is no need to restrict use of --ignore-missing to dry runs, it can be useful to ignore missing files during normal operation as well. Signed-off-by: Dieter Plaetinck <redacted> --- Documentation/git-add.txt | 9 +++++---- builtin/add.c | 4 +--- 2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 9c1d395..c6fae9f 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt@@ -138,10 +138,11 @@ subdirectories. true to make this the default behaviour. --ignore-missing:: - This option can only be used together with --dry-run. By using - this option the user can check if any of the given files would - be ignored, no matter if they are already present in the work - tree or not. + If some files could not be added because they are missing, + do not raise any error but continue adding the others. + By using this option with --dry-run the user can check if + any of the given files would be ignored, + no matter if they are already present in the work tree or not. \--:: This option can be used to separate command-line options from
diff --git a/builtin/add.c b/builtin/add.c
index 1c42900..e702714 100644
--- a/builtin/add.c
+++ b/builtin/add.c@@ -326,7 +326,7 @@ static struct option builtin_add_options[] = { OPT_BOOLEAN('A', "all", &addremove, "add changes from all tracked and untracked files"), OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"), OPT_BOOLEAN( 0 , "ignore-errors", &ignore_add_errors, "just skip files which cannot be added because of errors"), - OPT_BOOLEAN( 0 , "ignore-missing", &ignore_missing, "check if - even missing - files are ignored in dry run"), + OPT_BOOLEAN( 0 , "ignore-missing", &ignore_missing, "just skip files which do not exist"), OPT_END(), };
@@ -388,8 +388,6 @@ int cmd_add(int argc, const char **argv, const char *prefix) if (addremove && take_worktree_changes) 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) { static const char *here[2] = { ".", NULL }; argc = 1;
--
1.7.8.3