diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-26 18:10:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-26 18:10:47 (GMT) |
| commit | 0222bc91022cdd6f6b87afb4d01bbac964d05702 (patch) | |
| tree | 373d604e149c97e312ddc620e2d2df639cc6590d /t | |
| parent | 167843f285fdb7dbb95882f01f01757928a91ce8 (diff) | |
| parent | 16a794de889ecc11ccbcd5ecf998a128d6dbfa97 (diff) | |
| download | git-0222bc91022cdd6f6b87afb4d01bbac964d05702.zip git-0222bc91022cdd6f6b87afb4d01bbac964d05702.tar.gz git-0222bc91022cdd6f6b87afb4d01bbac964d05702.tar.bz2 | |
Merge branch 'rt/commentchar-fmt-merge-msg' into maint
* rt/commentchar-fmt-merge-msg:
t6200: avoid path mangling issue on Windows
fmt-merge-msg: use core.commentchar in tag signatures completely
fmt-merge-msg: respect core.commentchar in people credits
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6200-fmt-merge-msg.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh index f73ecea..54b5744 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} + + x By Another Author (3) and A U Thor (2) + x Via Another Committer + * left: + Left #5 + Left #4 + Left #3 + Common #2 + Common #1 + EOF + + git -c core.commentchar="x" 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 && |