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>
Junio C Hamano committed
Jul 10, 2008 at 00:50 UTC
4393c2374101fef9053643f9b4ec638b05bd0b26
2 files changed
+9
builtin-merge.c
+2
@@ -464,6 +464,8 @@ int git_merge_config(const char *k, const char *v, void *cb)
464
return git_config_string(&pull_twohead, k, v);
465
else if (!strcmp(k, "pull.octopus"))
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);
469
return git_diff_ui_config(k, v, cb);
470
}
471
t/t7600-merge.sh
+7
@@ -465,8 +465,15 @@ test_expect_success 'merge log message' '
465
git merge --no-log c2 &&
466
git show -s --pretty=format:%b HEAD >msg.act &&
467
verify_diff msg.nolog msg.act "[OOPS] bad merge log message" &&
468
+
469
git merge --log c3 &&
470
git show -s --pretty=format:%b HEAD >msg.act &&
471
+ verify_diff msg.log msg.act "[OOPS] bad merge log message" &&
472
+
473
+ git reset --hard HEAD^ &&
474
+ git config merge.log yes &&
475
+ git merge c3 &&
476
+ git show -s --pretty=format:%b HEAD >msg.act &&
477
verify_diff msg.log msg.act "[OOPS] bad merge log message"
478
'
479