aboutsummaryrefslogtreecommitdiff
path: root/t/t6200-fmt-merge-msg.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-15 12:40:56 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-15 12:40:56 -0700
commit948cf4f5e546876cade022640873f92dbc2de1ee (patch)
treeeb88902047aa37c738adef6252382db7a615ec82 /t/t6200-fmt-merge-msg.sh
parente1a3f17e9d81f88ed5e62d01252167daa597e5a5 (diff)
parent89c3bbd808b352a9f4047523b81b72f22eefb868 (diff)
downloadgit-948cf4f5e546876cade022640873f92dbc2de1ee.tar.gz
git-948cf4f5e546876cade022640873f92dbc2de1ee.tar.xz
Merge branch 'rt/commentchar-fmt-merge-msg'
The new core.commentchar configuration was not applied to a few places. * rt/commentchar-fmt-merge-msg: fmt-merge-msg: use core.commentchar in tag signatures completely fmt-merge-msg: respect core.commentchar in people credits
Diffstat (limited to 't/t6200-fmt-merge-msg.sh')
-rwxr-xr-xt/t6200-fmt-merge-msg.sh18
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index f73eceabf..e7e945db0 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -175,6 +175,24 @@ test_expect_success 'merge.log=5 shows all 5 commits' '
test_cmp expected actual
'
+test_expect_success '--log=5 with custom comment character' '
+ cat >expected <<-EOF &&
+ Merge branch ${apos}left${apos}
+
+ / By Another Author (3) and A U Thor (2)
+ / Via Another Committer
+ * left:
+ Left #5
+ Left #4
+ Left #3
+ Common #2
+ Common #1
+ EOF
+
+ git -c core.commentchar="/" fmt-merge-msg --log=5 <.git/FETCH_HEAD >actual &&
+ test_cmp expected actual
+'
+
test_expect_success 'merge.log=0 disables shortlog' '
echo "Merge branch ${apos}left${apos}" >expected
git -c merge.log=0 fmt-merge-msg <.git/FETCH_HEAD >actual &&