| commit | ce0646184696ae6d87c0e243d058cf5df6459c4f | |
| author | Jeff King <peff@peff.net> | |
| Sun, 9 Aug 2009 10:01:48 +0000 (9 06:01 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 9 Aug 2009 19:34:19 +0000 (9 12:34 -0700) | ||
| tree | 40d70e9063f113957fbc23e8a5d041a7187a8511 | treesnapshot (tar.gz zip) |
| parent | 5dc36a5888a7063ff4536c9ea50eb0557bfef627 | commitdiff |
add tests for merge message headings
When calling "git merge $X", we automatically generate a
commit message containing something like "Merge branch
'$X'". This test script checks that those messages say what
they should, and exposes a failure when merging a refname
that is ambiguous between a tag and a branch.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When calling "git merge $X", we automatically generate a
commit message containing something like "Merge branch
'$X'". This test script checks that those messages say what
they should, and exposes a failure when merging a refname
that is ambiguous between a tag and a branch.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7608-merge-messages.sh | [new file with mode: 0755] | blob |