diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:44:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:44:22 -0800 |
| commit | 684d0d8dcfa2288744a553fc7294c5f9f5c12026 (patch) | |
| tree | d790223199de25afa95aeb898d1b85d1e1dd3e1c /t/t6006-rev-list-format.sh | |
| parent | 261fbda903762b9c47e4138312673ea25555d9e5 (diff) | |
| parent | 9fa708dab1ccf8be69a606ca4eb58e62f3ef334a (diff) | |
| download | git-684d0d8dcfa2288744a553fc7294c5f9f5c12026.tar.gz git-684d0d8dcfa2288744a553fc7294c5f9f5c12026.tar.xz | |
Merge branch 'jc/pretty-lf'
Conflicts:
pretty.c
t/t6006-rev-list-format.sh
Diffstat (limited to 't/t6006-rev-list-format.sh')
| -rwxr-xr-x | t/t6006-rev-list-format.sh | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index 7f61ab0e5..571931588 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh @@ -162,6 +162,28 @@ test_expect_success 'empty email' ' } ' +test_expect_success 'del LF before empty (1)' ' + git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD^^ >actual && + test $(wc -l <actual) = 2 +' + +test_expect_success 'del LF before empty (2)' ' + git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD >actual && + test $(wc -l <actual) = 6 && + grep "^$" actual +' + +test_expect_success 'add LF before non-empty (1)' ' + git show -s --pretty=format:"%s%+b%nThanks%n" HEAD^^ >actual && + test $(wc -l <actual) = 2 +' + +test_expect_success 'add LF before non-empty (2)' ' + git show -s --pretty=format:"%s%+b%nThanks%n" HEAD >actual && + test $(wc -l <actual) = 6 && + grep "^$" actual +' + test_expect_success '"%h %gD: %gs" is same as git-reflog' ' git reflog >expect && git log -g --format="%h %gD: %gs" >actual && |