Hello! I have added the --recursive alias for the -r option to the rm command.
H.
From 83f197151c04164b0dfd4d127e72439aebaf8b71 Mon Sep 17 00:00:00 2001
From: Hans Ginzel <[email protected]> Date: Wed, 18 Nov 2015 15:44:56 +0100 Subject: [PATCH] builtin: rm: add --recursive to be consistent with GNU rm diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt index f1efc11..0ab1cd4 100644 --- a/Documentation/git-rm.txt +++ b/Documentation/git-rm.txt @@ -47,6 +47,7 @@ OPTIONS by the command. -r:: +--recursive:: Allow recursive removal when a leading directory name is given. diff --git a/builtin/rm.c b/builtin/rm.c index 80b972f..311b4da 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -269,7 +269,7 @@ static struct option builtin_rm_options[] = { OPT__QUIET(&quiet, N_("do not list removed files")), OPT_BOOL( 0 , "cached", &index_only, N_("only remove from the index")), OPT__FORCE(&force, N_("override the up-to-date check")), - OPT_BOOL('r', NULL, &recursive, N_("allow recursive removal")), + OPT_BOOL('r', "recursive", &recursive, N_("allow recursive removal")), OPT_BOOL( 0 , "ignore-unmatch", &ignore_unmatch, N_("exit with a zero status even if nothing matched")), OPT_END(), diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 9d90d2c..d7b73f9 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -207,12 +207,25 @@ test_expect_success 'Recursive with -r but dirty' ' test -f frotz/nitfol ' +test_expect_success 'Recursive with --recursive but dirty' ' + echo qfwfq >>frotz/nitfol && + test_must_fail git rm --recursive frotz && + test -d frotz && + test -f frotz/nitfol +' + test_expect_success 'Recursive with -r -f' ' git rm -f -r frotz && ! test -f frotz/nitfol && ! test -d frotz ' +test_expect_success 'Recursive with --recursive -f' ' + git rm -f --recursive frotz && + ! test -f frotz/nitfol && + ! test -d frotz +' + test_expect_success 'Remove nonexistent file returns nonzero exit status' ' test_must_fail git rm nonexistent ' -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
