diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-29 12:36:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-29 12:36:09 -0700 |
| commit | b8e533f12acec63242c5405286fbbcfa66eecfdd (patch) | |
| tree | 32ededef297ace728b1c59a5425b8b383eae75a8 /t | |
| parent | a9583afc1df1df10d60d2b81fd4b0976bc67ca4e (diff) | |
| parent | 9271095cc5571e306d709ebf8eb7f0a388254d9d (diff) | |
| download | git-b8e533f12acec63242c5405286fbbcfa66eecfdd.tar.gz | |
Merge branch 'hj/pretty-naked-decoration'
The pretty-format specifier "%d", which expanded to " (tagname)"
for a tagged commit, gained a cousin "%D" that just gives the
"tagname" without frills.
* hj/pretty-naked-decoration:
pretty: add %D format specifier
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4205-log-pretty-formats.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index 9b75399572..7398605e7b 100755 --- a/t/t4205-log-pretty-formats.sh +++ b/t/t4205-log-pretty-formats.sh @@ -465,4 +465,15 @@ EOF test_cmp expected actual1 ' +test_expect_success 'clean log decoration' ' + git log --no-walk --tags --pretty="%H %D" --decorate=full >actual && + cat >expected <<EOF && +$head1 tag: refs/tags/tag2 +$head2 tag: refs/tags/message-one +$old_head1 tag: refs/tags/message-two +EOF + sort actual >actual1 && + test_cmp expected actual1 +' + test_done |