summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-11-13 22:37:23 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-13 22:37:23 +0900
commit20d04b4419559825160c267fb05cc5c683fbece8 (patch)
tree32e151a0e21610511ebca414dc781b641cea5f2f /builtin
parentMerge branch 'jt/tighten-fetch-proto-v2-response' (diff)
parentrev-parse: clear --exclude list after 'git rev-parse --all' (diff)
downloadtgif-20d04b4419559825160c267fb05cc5c683fbece8.tar.xz
Merge branch 'ag/rev-parse-all-exclude-fix'
"git rev-parse --exclude=* --branches --branches" (i.e. first saying "add only things that do not match '*' out of all branches" and then adding all branches, without any exclusion this time") worked as expected, but "--exclude=* --all --all" did not work the same way, which has been fixed. * ag/rev-parse-all-exclude-fix: rev-parse: clear --exclude list after 'git rev-parse --all'
Diffstat (limited to 'builtin')
-rw-r--r--builtin/rev-parse.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 455f62246d..10d4dab894 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -765,6 +765,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
}
if (!strcmp(arg, "--all")) {
for_each_ref(show_reference, NULL);
+ clear_ref_exclusion(&ref_excludes);
continue;
}
if (skip_prefix(arg, "--disambiguate=", &arg)) {