From: Miklos Vajna Date: Thu, 10 Jul 2008 08:32:22 GMT Subject: [PATCH] Add testcase for merge.log Message-ID: <1215678742-14042-1-git-send-email-vmiklos@frugalware.org> In-Reply-To: <7v7ibuqisc.fsf@gitster.siamese.dyndns.org> Make sure that the merge.log boolean config setting is the same as --log and --no-log. Signed-off-by: Miklos Vajna --- On Thu, Jul 10, 2008 at 12:50:59AM -0700, Junio C Hamano wrote: > The command forgot the configuration variable when rewritten in C. Thanks. Here is a testcase. t/t7600-merge.sh | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index dfddd86..a3c17a9 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -456,6 +456,17 @@ test_expect_success 'merge log message' ' verify_diff msg.log msg.act "[OOPS] bad merge log message" ' +test_expect_success 'merge log message (from config)' ' + git reset --hard c0 && + git merge c2 && + git show -s --pretty=format:%b HEAD >msg.act && + verify_diff msg.nolog msg.act "[OOPS] bad merge log message" && + git config merge.log true && + git merge c3 && + git show -s --pretty=format:%b HEAD >msg.act && + verify_diff msg.log msg.act "[OOPS] bad merge log message" +' + test_debug 'gitk --all' test_done -- 1.5.6.2.450.g8d367.dirty