From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Jul 2008 07:50:59 +0000 (-0700)
Subject: Teach merge.log to "git-merge" again
X-Git-Tag: v1.6.0-rc0~51^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4393c2374101fef9053643f9b4ec638b05bd0b26;p=git.git

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>
---

diff --git a/builtin-merge.c b/builtin-merge.c
index b2e702a11..2ee167469 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -464,6 +464,8 @@ int git_merge_config(const char *k, const char *v, void *cb)
 		return git_config_string(&pull_twohead, k, v);
 	else if (!strcmp(k, "pull.octopus"))
 		return git_config_string(&pull_octopus, k, v);
+	else if (!strcmp(k, "merge.log") || !strcmp(k, "merge.summary"))
+		option_log = git_config_bool(k, v);
 	return git_diff_ui_config(k, v, cb);
 }
 
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"
 '