Browse Source

rev-parse: clear --exclude list after 'git rev-parse --all'

Commit [1] added the --exclude option to revision.c.  The --all,
--branches, --tags, --remotes, and --glob options clear the exclude
list.  Shortly therafter, commit [2] added the same to 'git rev-parse',
but without clearing the exclude list for the --all option.

[1] e7b432c52 ("revision: introduce --exclude=<glob> to tame wildcards", 2013-08-30)
[2] 9dc01bf06 ("rev-parse: introduce --exclude=<glob> to tame wildcards", 2013-11-01)

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Andreas Gruenbacher 6 years ago committed by Junio C Hamano
parent
commit
5221048092
  1. 1
      builtin/rev-parse.c
  2. 12
      t/t6018-rev-list-glob.sh

1
builtin/rev-parse.c

@ -760,6 +760,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) @@ -760,6 +760,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)) {

12
t/t6018-rev-list-glob.sh

@ -141,6 +141,18 @@ test_expect_success 'rev-parse accumulates multiple --exclude' ' @@ -141,6 +141,18 @@ test_expect_success 'rev-parse accumulates multiple --exclude' '
compare rev-parse "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
'

test_expect_success 'rev-parse --branches clears --exclude' '
compare rev-parse "--exclude=* --branches --branches" "--branches"
'

test_expect_success 'rev-parse --tags clears --exclude' '
compare rev-parse "--exclude=* --tags --tags" "--tags"
'

test_expect_success 'rev-parse --all clears --exclude' '
compare rev-parse "--exclude=* --all --all" "--all"
'

test_expect_success 'rev-list --glob=refs/heads/subspace/*' '

compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/*"

Loading…
Cancel
Save