Teach merge.log to "git-merge" again

gitster · gitster · commit 4393c2374101 · 2008-07-10T01:05:47.000-07:00
The command forgot the configuration variable when rewritten in C.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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"
 '
 

Original file line number	Diff line number	Diff line change
`@@ -464,6 +464,8 @@ int git_merge_config(const char k, const char v, void *cb)`
`464`	`464`	`return git_config_string(&pull_twohead, k, v);`
`465`	`465`	`else if (!strcmp(k, "pull.octopus"))`
`466`	`466`	`return git_config_string(&pull_octopus, k, v);`
	`467`	`+ else if (!strcmp(k, "merge.log") \|\| !strcmp(k, "merge.summary"))`
	`468`	`+ option_log = git_config_bool(k, v);`
`467`	`469`	`return git_diff_ui_config(k, v, cb);`
`468`	`470`	`}`
`469`	`471`