diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-10 00:50:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-10 01:05:47 -0700 |
| commit | 4393c2374101fef9053643f9b4ec638b05bd0b26 (patch) | |
| tree | 6148268877dac7ac97bf39628ef92c97680d3c33 /t | |
| parent | 1c7b76be7d620bbaf2e6b8417f04012326bbb9df (diff) | |
| download | git-4393c2374101fef9053643f9b4ec638b05bd0b26.tar.gz git-4393c2374101fef9053643f9b4ec638b05bd0b26.tar.xz | |
Teach merge.log to "git-merge" again
The command forgot the configuration variable when rewritten in C.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7600-merge.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index d21cd290d..72ef2e55d 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -465,8 +465,15 @@ test_expect_success 'merge log message' ' git merge --no-log c2 && git show -s --pretty=format:%b HEAD >msg.act && verify_diff msg.nolog msg.act "[OOPS] bad merge log message" && + git merge --log c3 && git show -s --pretty=format:%b HEAD >msg.act && + verify_diff msg.log msg.act "[OOPS] bad merge log message" && + + git reset --hard HEAD^ && + git config merge.log yes && + git merge c3 && + git show -s --pretty=format:%b HEAD >msg.act && verify_diff msg.log msg.act "[OOPS] bad merge log message" ' |