diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-22 09:45:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-22 09:45:22 -0700 |
| commit | 223a923c37f76ee91eb6a9cb77ce6d31dcf939cc (patch) | |
| tree | b56a1133686e8a283ed13141459a73aa7056c74b /t | |
| parent | 5bfd53629e93113a17fe7d6a7a24554dc3c17cdb (diff) | |
| parent | 7b88176e9bce658fd44c2192c1b7aa6e612ee0c2 (diff) | |
| download | git-223a923c37f76ee91eb6a9cb77ce6d31dcf939cc.tar.gz git-223a923c37f76ee91eb6a9cb77ce6d31dcf939cc.tar.xz | |
Merge branch 'mg/pretty-magic-space'
* mg/pretty-magic-space:
pretty: Introduce ' ' modifier to add space if non-empty
Conflicts:
pretty.c
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6006-rev-list-format.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index 9b77073df..cccacd4ad 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh @@ -200,6 +200,16 @@ test_expect_success 'add LF before non-empty (2)' ' grep "^$" actual ' +test_expect_success 'add SP before non-empty (1)' ' + git show -s --pretty=format:"%s% bThanks" HEAD^^ >actual && + test $(wc -w <actual) = 2 +' + +test_expect_success 'add SP before non-empty (2)' ' + git show -s --pretty=format:"%s% sThanks" HEAD^^ >actual && + test $(wc -w <actual) = 4 +' + test_expect_success '--abbrev' ' echo SHORT SHORT SHORT >expect2 && echo LONG LONG LONG >expect3 && |