diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-11-06 23:17:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-06 23:17:47 -0800 |
| commit | 6e31f3dbb59c70cae04be3a1fc620e16d247e7d7 (patch) | |
| tree | 0ae5ce18e7f69766253c8fb174506cf644f9cee6 /t | |
| parent | pack-objects: move thread autodetection closer to relevant code (diff) | |
| parent | builtin-commit.c: fix logic to omit empty line before existing footers (diff) | |
| download | tgif-6e31f3dbb59c70cae04be3a1fc620e16d247e7d7.tar.xz | |
Merge branch 'jc/commit-s-subject-is-not-a-footer'
* jc/commit-s-subject-is-not-a-footer:
builtin-commit.c: fix logic to omit empty line before existing footers
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7502-commit.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index 56cd866019..fe94552296 100755 --- a/t/t7502-commit.sh +++ b/t/t7502-commit.sh @@ -258,4 +258,13 @@ test_expect_success 'Hand committing of a redundant merge removes dups' ' ' +test_expect_success 'A single-liner subject with a token plus colon is not a footer' ' + + git reset --hard && + git commit -s -m "hello: kitty" --allow-empty && + git cat-file commit HEAD | sed -e "1,/^$/d" >actual && + test $(wc -l <actual) = 3 + +' + test_done |