diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:01 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:01 +0900 |
| commit | 501ec0dad31a5379ac7620f8655de882844fd3c1 (patch) | |
| tree | f70bdfbae0b2f99e4aa1b278bd22b72609c3487c /t | |
| parent | 8dc1d0bf64ce84030a1a13ea64343f816dba9e27 (diff) | |
| parent | da769d2986470931b8e80b8d14afcae3d7cc20d7 (diff) | |
| download | git-501ec0dad31a5379ac7620f8655de882844fd3c1.tar.gz | |
Merge branch 'jk/describe-omit-some-refs' into maint
"git describe --match" learned to take multiple patterns in v2.13
series, but the feature ignored the patterns after the first one
and did not work at all. This has been fixed.
* jk/describe-omit-some-refs:
describe: fix matching to actually match all patterns
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6120-describe.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index aa74eb8f0d..25110ea55d 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -182,10 +182,14 @@ check_describe "test2-lightweight-*" --tags --match="test2-*" check_describe "test2-lightweight-*" --long --tags --match="test2-*" HEAD^ -check_describe "test1-lightweight-*" --long --tags --match="test1-*" --match="test2-*" HEAD^ +check_describe "test2-lightweight-*" --long --tags --match="test1-*" --match="test2-*" HEAD^ check_describe "test2-lightweight-*" --long --tags --match="test1-*" --no-match --match="test2-*" HEAD^ +check_describe "test1-lightweight-*" --long --tags --match="test1-*" --match="test3-*" HEAD + +check_describe "test1-lightweight-*" --long --tags --match="test3-*" --match="test1-*" HEAD + test_expect_success 'name-rev with exact tags' ' echo A >expect && tag_object=$(git rev-parse refs/tags/A) && |