diff options
| author | Steven Grimm <koreth@midwinter.com> | 2007-04-16 00:53:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-17 00:19:11 -0700 |
| commit | bb1faf0d5bc53b193bbe25e7425458c8eb85efa3 (patch) | |
| tree | 46db8d5a9e7845ebe78ee2148a5bd69c8b989268 | |
| parent | f948792990f82a35bf0c98510e7511ef8acb9cd3 (diff) | |
| download | git-bb1faf0d5bc53b193bbe25e7425458c8eb85efa3.tar.gz | |
Add --ignore-unmatch option to exit with zero status when no files are removed.
Signed-off-by: Steven Grimm <koreth@midwinter.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/git-rm.txt | 5 | ||||
| -rw-r--r-- | builtin-rm.c | 21 | ||||
| -rwxr-xr-x | t/t3600-rm.sh | 4 |
3 files changed, 25 insertions, 5 deletions
diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt index b051ccb6d6..a65f24a0f6 100644 --- a/Documentation/git-rm.txt +++ b/Documentation/git-rm.txt @@ -7,7 +7,7 @@ git-rm - Remove files from the working tree and from the index SYNOPSIS -------- -'git-rm' [-f] [-n] [-r] [--cached] [--] <file>... +'git-rm' [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>... DESCRIPTION ----------- @@ -47,6 +47,9 @@ OPTIONS the paths only from the index, leaving working tree files. +\--ignore-unmatch:: + Exit with a zero status even if no files matched. + \--quiet:: git-rm normally outputs one line (in the form of an "rm" command) for each file removed. This option suppresses that output. diff --git a/builtin-rm.c b/builtin-rm.c index b77b058e38..4a0bd93c8b 100644 --- a/builtin-rm.c +++ b/builtin-rm.c @@ -10,7 +10,7 @@ #include "tree-walk.h" static const char builtin_rm_usage[] = -"git-rm [-f] [-n] [-r] [--cached] [--quiet] [--] <file>..."; +"git-rm [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>..."; static struct { int nr, alloc; @@ -105,6 +105,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix) { int i, newfd; int show_only = 0, force = 0, index_only = 0, recursive = 0, quiet = 0; + int ignore_unmatch = 0; const char **pathspec; char *seen; @@ -134,6 +135,8 @@ int cmd_rm(int argc, const char **argv, const char *prefix) recursive = 1; else if (!strcmp(arg, "--quiet")) quiet = 1; + else if (!strcmp(arg, "--ignore-unmatch")) + ignore_unmatch = 1; else usage(builtin_rm_usage); } @@ -155,14 +158,24 @@ int cmd_rm(int argc, const char **argv, const char *prefix) if (pathspec) { const char *match; + int seen_any = 0; for (i = 0; (match = pathspec[i]) != NULL ; i++) { - if (!seen[i]) - die("pathspec '%s' did not match any files", - match); + if (!seen[i]) { + if (!ignore_unmatch) { + die("pathspec '%s' did not match any files", + match); + } + } + else { + seen_any = 1; + } if (!recursive && seen[i] == MATCHED_RECURSIVELY) die("not removing '%s' recursively without -r", *match ? match : "."); } + + if (! seen_any) + exit(0); } /* diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index da9da92180..0a97b75288 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -84,6 +84,10 @@ test_expect_success \ 'When the rm in "git-rm -f" fails, it should not remove the file from the index' \ 'git-ls-files --error-unmatch baz' +test_expect_success 'Remove nonexistent file with --ignore-unmatch' ' + git rm --ignore-unmatch nonexistent +' + test_expect_success '"rm" command printed' ' echo frotz > test-file && git add test-file && |