diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-10-07 05:32:54 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-07 05:32:54 +0300 |
| commit | ed6822896bf4d28c12614e18e3fdcc5dc27ff8e5 (patch) | |
| tree | 4e43a17a745392858901709f84e18c237c725514 /t/t4202-log.sh | |
| parent | ad8f0368b45bf1ab0f1339033d0a62cee94b1ae2 (diff) | |
| parent | 0cc7380d8846c30ce0d5d6310b2cb5994f269133 (diff) | |
Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude'
"git log --decorate-refs-exclude=<pattern>" was incorrectly
overruled when the "--simplify-by-decoration" option is used, which
has been corrected.
* rs/simplify-by-deco-with-deco-refs-exclude:
log-tree: call load_ref_decorations() in get_name_decoration()
log: test --decorate-refs-exclude with --simplify-by-decoration
Diffstat (limited to 't/t4202-log.sh')
| -rwxr-xr-x | t/t4202-log.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index e88ccb04a9..e803ba402e 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -837,6 +837,21 @@ test_expect_success 'decorate-refs and decorate-refs-exclude' ' test_cmp expect.decorate actual ' +test_expect_success 'decorate-refs-exclude and simplify-by-decoration' ' + cat >expect.decorate <<-\EOF && + Merge-tag-reach (HEAD -> master) + reach (tag: reach, reach) + seventh (tag: seventh) + Merge-branch-tangle + Merge-branch-side-early-part-into-tangle (tangle) + tangle-a (tag: tangle-a) + EOF + git log -n6 --decorate=short --pretty="tformat:%f%d" \ + --decorate-refs-exclude="*octopus*" \ + --simplify-by-decoration >actual && + test_cmp expect.decorate actual +' + test_expect_success 'log.decorate config parsing' ' git log --oneline --decorate=full >expect.full && git log --oneline --decorate=short >expect.short && |