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 b2e702a11fe0c1849caf0da508f9f2febecb5439..2ee16746908179960fcd57dc16d042d24f741833 100644 (file)
--- 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);
                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);
 }
 
        return git_diff_ui_config(k, v, cb);
 }
 

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index d21cd290d3d8e3d912b94045f3d3d9db8bdd7e7d..72ef2e55d9f9c175d94d4b37fac7606f537b6c71 100755 (executable)
--- 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 --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 &&
        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"
 '
 
        verify_diff msg.log msg.act "[OOPS] bad merge log message"
 '