Add --quiet option to suppress output of "rm" commands for removed files.

Signed-off-by: Steven Grimm <koreth@midwinter.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 6feebc0400b86407a118840d9a6cc994a94715d6..b051ccb6d6d47d7fdb41ba27e3e42c82a4460608 100644 (file)
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -47,6 +47,10 @@ OPTIONS
        the paths only from the index, leaving working tree
        files.
 
        the paths only from the index, leaving working tree
        files.
 

+\--quiet::
+       git-rm normally outputs one line (in the form of an "rm" command)
+       for each file removed. This option suppresses that output.
+

 
 DISCUSSION
 ----------
 
 DISCUSSION
 ----------

diff --git a/builtin-rm.c b/builtin-rm.c
index 8a0738f83dd31a847bf486ddb3aefef94af5e049..d3de4b54524cc616b12353a180e821ec57c27f1a 100644 (file)
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -10,7 +10,7 @@
 #include "tree-walk.h"
 
 static const char builtin_rm_usage[] =
 #include "tree-walk.h"
 
 static const char builtin_rm_usage[] =

-"git-rm [-f] [-n] [-r] [--cached] [--] <file>...";
+"git-rm [-f] [-n] [-r] [--cached] [--quiet] [--] <file>...";

 
 static struct {
        int nr, alloc;
 
 static struct {
        int nr, alloc;


@@ -104,7 +104,7 @@ static struct lock_file lock_file;
 int cmd_rm(int argc, const char **argv, const char *prefix)
 {
        int i, newfd;
 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;
+       int show_only = 0, force = 0, index_only = 0, recursive = 0, quiet = 0;

        const char **pathspec;
        char *seen;
 
        const char **pathspec;
        char *seen;
 


@@ -132,6 +132,8 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
                        force = 1;
                else if (!strcmp(arg, "-r"))
                        recursive = 1;
                        force = 1;
                else if (!strcmp(arg, "-r"))
                        recursive = 1;

+               else if (!strcmp(arg, "--quiet"))
+                       quiet = 1;

                else
                        usage(builtin_rm_usage);
        }
                else
                        usage(builtin_rm_usage);
        }


@@ -187,7 +189,8 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
         */
        for (i = 0; i < list.nr; i++) {
                const char *path = list.name[i];
         */
        for (i = 0; i < list.nr; i++) {
                const char *path = list.name[i];

-               printf("rm '%s'\n", path);
+               if (!quiet)
+                       printf("rm '%s'\n", path);

 
                if (remove_file_from_cache(path))
                        die("git-rm: unable to remove %s", path);
 
                if (remove_file_from_cache(path))
                        die("git-rm: unable to remove %s", path);

diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index e31cf93a00ab377355734b3d88d536d36fe734e1..da9da9218065678a5f223143e3d3de2b928e7114 100755 (executable)
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -84,6 +84,26 @@ 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'
 
     '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 '"rm" command printed' '
+       echo frotz > test-file &&
+       git add test-file &&
+       git commit -m "add file for rm test" &&
+       git rm test-file > rm-output &&
+       test `egrep "^rm " rm-output | wc -l` = 1 &&
+       rm -f test-file rm-output &&
+       git commit -m "remove file from rm test"
+'
+
+test_expect_success '"rm" command suppressed with --quiet' '
+       echo frotz > test-file &&
+       git add test-file &&
+       git commit -m "add file for rm --quiet test" &&
+       git rm --quiet test-file > rm-output &&
+       test `wc -l < rm-output` = 0 &&
+       rm -f test-file rm-output &&
+       git commit -m "remove file from rm --quiet test"
+'
+

 # Now, failure cases.
 test_expect_success 'Re-add foo and baz' '
        git add foo baz &&
 # Now, failure cases.
 test_expect_success 'Re-add foo and baz' '
        git add foo baz &&


@@ -154,4 +174,8 @@ test_expect_success 'Recursive with -r -f' '
        ! test -d frotz
 '
 
        ! test -d frotz
 '
 

+test_expect_failure 'Remove nonexistent file returns nonzero exit status' '
+       git rm nonexistent
+'
+

 test_done
 test_done