зеркало из https://github.com/microsoft/git.git
refs: show --exclude failure with --branches/tags/remotes=glob
The documentation of `--exclude=` option from rev-list and rev-parse explicitly states that exclude patterns *should not* start with 'refs/' when used with `--branches`, `--tags` or `--remotes`. However, following this advice results in refereces not being excluded if the next `--branches`, `--tags`, `--remotes` use the optional inclusive glob. Demonstrate this failure. Signed-off-by: Rafael Ascensão <rafa.almas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
cae598d998
Коммит
9d55dca262
|
@ -36,7 +36,13 @@ test_expect_success 'setup' '
|
|||
git tag foo/bar master &&
|
||||
commit master3 &&
|
||||
git update-ref refs/remotes/foo/baz master &&
|
||||
commit master4
|
||||
commit master4 &&
|
||||
git update-ref refs/remotes/upstream/one subspace/one &&
|
||||
git update-ref refs/remotes/upstream/two subspace/two &&
|
||||
git update-ref refs/remotes/upstream/x subspace-x &&
|
||||
git tag qux/one subspace/one &&
|
||||
git tag qux/two subspace/two &&
|
||||
git tag qux/x subspace-x
|
||||
'
|
||||
|
||||
test_expect_success 'rev-parse --glob=refs/heads/subspace/*' '
|
||||
|
@ -141,6 +147,54 @@ test_expect_success 'rev-parse accumulates multiple --exclude' '
|
|||
compare rev-parse "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
|
||||
'
|
||||
|
||||
test_expect_failure 'rev-parse --exclude=glob with --branches=glob' '
|
||||
compare rev-parse "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
|
||||
'
|
||||
|
||||
test_expect_failure 'rev-parse --exclude=glob with --tags=glob' '
|
||||
compare rev-parse "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
|
||||
'
|
||||
|
||||
test_expect_failure 'rev-parse --exclude=glob with --remotes=glob' '
|
||||
compare rev-parse "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
|
||||
'
|
||||
|
||||
test_expect_failure 'rev-parse --exclude=ref with --branches=glob' '
|
||||
compare rev-parse "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
|
||||
'
|
||||
|
||||
test_expect_failure 'rev-parse --exclude=ref with --tags=glob' '
|
||||
compare rev-parse "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
|
||||
'
|
||||
|
||||
test_expect_failure 'rev-parse --exclude=ref with --remotes=glob' '
|
||||
compare rev-parse "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
|
||||
'
|
||||
|
||||
test_expect_failure 'rev-list --exclude=glob with --branches=glob' '
|
||||
compare rev-list "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
|
||||
'
|
||||
|
||||
test_expect_failure 'rev-list --exclude=glob with --tags=glob' '
|
||||
compare rev-list "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
|
||||
'
|
||||
|
||||
test_expect_failure 'rev-list --exclude=glob with --remotes=glob' '
|
||||
compare rev-list "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
|
||||
'
|
||||
|
||||
test_expect_failure 'rev-list --exclude=ref with --branches=glob' '
|
||||
compare rev-list "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
|
||||
'
|
||||
|
||||
test_expect_failure 'rev-list --exclude=ref with --tags=glob' '
|
||||
compare rev-list "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
|
||||
'
|
||||
|
||||
test_expect_failure 'rev-list --exclude=ref with --remotes=glob' '
|
||||
compare rev-list "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
|
||||
'
|
||||
|
||||
test_expect_success 'rev-list --glob=refs/heads/subspace/*' '
|
||||
|
||||
compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
|
||||
|
@ -233,7 +287,7 @@ test_expect_success 'rev-list --tags=foo' '
|
|||
|
||||
test_expect_success 'rev-list --tags' '
|
||||
|
||||
compare rev-list "foo/bar" "--tags"
|
||||
compare rev-list "foo/bar qux/x qux/two qux/one" "--tags"
|
||||
|
||||
'
|
||||
|
||||
|
@ -292,7 +346,7 @@ test_expect_success 'shortlog accepts --glob/--tags/--remotes' '
|
|||
"master other/three someref subspace-x subspace/one subspace/two" \
|
||||
"--glob=heads/*" &&
|
||||
compare shortlog foo/bar --tags=foo &&
|
||||
compare shortlog foo/bar --tags &&
|
||||
compare shortlog "foo/bar qux/one qux/two qux/x" --tags &&
|
||||
compare shortlog foo/baz --remotes=foo
|
||||
|
||||
'
|
||||
|
|
Загрузка…
Ссылка в новой задаче