projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5dc36a5) | patch
add tests for merge message headings
authorJeff King <peff@peff.net>
Sun, 9 Aug 2009 10:01:48 +0000 (06:01 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Aug 2009 19:34:19 +0000 (12:34 -0700)
commitce0646184696ae6d87c0e243d058cf5df6459c4f
tree40d70e9063f113957fbc23e8a5d041a7187a8511tree | snapshot
parent5dc36a5888a7063ff4536c9ea50eb0557bfef627commit | diff
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>
t/t7608-merge-messages.sh [new file with mode: 0755] blob
Unnamed repository; edit this file 'description' to name the repository.