{"thread":{"id":"14390","subject":"[PATCH] Teach merge.log to \"git-merge\" again","startedAt":"2008-07-10T07:50:59Z","lastAt":"2008-07-14T12:06:30Z","messageCount":3,"participants":["Junio C Hamano","Miklos Vajna"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"82794","messageId":"7v7ibuqisc.fsf@gitster.siamese.dyndns.org","threadId":"14390","inReplyTo":null,"subject":"[PATCH] Teach merge.log to \"git-merge\" again","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-07-10T07:50:59Z","receivedAt":"2008-07-10T07:50:59Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"The command forgot the configuration variable when rewritten in C.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n builtin-merge.c |    2 ++\n 1 files changed, 2 insertions(+), 0 deletions(-)\n\ndiff --git a/builtin-merge.c b/builtin-merge.c\nindex 821edcd..bc3f921 100644\n--- a/builtin-merge.c\n+++ b/builtin-merge.c\n@@ -519,8 +519,10 @@ int git_merge_config(const char *k, const char *v, void *cb)\n \telse if (!strcmp(k, \"pull.twohead\"))\n \t\treturn git_config_string(&pull_twohead, k, v);\n \telse if (!strcmp(k, \"pull.octopus\"))\n \t\treturn git_config_string(&pull_octopus, k, v);\n+\telse if (!strcmp(k, \"merge.log\") || !strcmp(k, \"merge.summary\"))\n+\t\toption_log = git_config_bool(k, v);\n \treturn git_diff_ui_config(k, v, cb);\n }\n \n static int read_tree_trivial(unsigned char *common, unsigned char *head,\n"},{"id":"82797","messageId":"1215678742-14042-1-git-send-email-vmiklos@frugalware.org","threadId":"14390","inReplyTo":"7v7ibuqisc.fsf@gitster.siamese.dyndns.org","subject":"[PATCH] Add testcase for merge.log","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-07-10T08:32:22Z","receivedAt":"2008-07-10T08:32:22Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"Make sure that the merge.log boolean config setting is the same as --log\nand --no-log.\n\nSigned-off-by: Miklos Vajna <vmiklos@frugalware.org>\n---\n\nOn Thu, Jul 10, 2008 at 12:50:59AM -0700, Junio C Hamano <gitster@pobox.com> wrote:\n> The command forgot the configuration variable when rewritten in C.\n\nThanks. Here is a testcase.\n\n t/t7600-merge.sh |   11 +++++++++++\n 1 files changed, 11 insertions(+), 0 deletions(-)\n\ndiff --git a/t/t7600-merge.sh b/t/t7600-merge.sh\nindex dfddd86..a3c17a9 100755\n--- a/t/t7600-merge.sh\n+++ b/t/t7600-merge.sh\n@@ -456,6 +456,17 @@ test_expect_success 'merge log message' '\n \tverify_diff msg.log msg.act \"[OOPS] bad merge log message\"\n '\n \n+test_expect_success 'merge log message (from config)' '\n+\tgit reset --hard c0 &&\n+\tgit merge c2 &&\n+\tgit show -s --pretty=format:%b HEAD >msg.act &&\n+\tverify_diff msg.nolog msg.act \"[OOPS] bad merge log message\" &&\n+\tgit config merge.log true &&\n+\tgit merge c3 &&\n+\tgit show -s --pretty=format:%b HEAD >msg.act &&\n+\tverify_diff msg.log msg.act \"[OOPS] bad merge log message\"\n+'\n+\n test_debug 'gitk --all'\n \n test_done\n-- \n1.5.6.2.450.g8d367.dirty\n"},{"id":"83254","messageId":"20080714120630.GN10347@genesis.frugalware.org","threadId":"14390","inReplyTo":"1215678742-14042-1-git-send-email-vmiklos@frugalware.org","subject":"Re: [PATCH] Add testcase for merge.log","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-07-14T12:06:30Z","receivedAt":"2008-07-14T12:06:30Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Thu, Jul 10, 2008 at 10:32:22AM +0200, Miklos Vajna <vmiklos@frugalware.org> wrote:\n> On Thu, Jul 10, 2008 at 12:50:59AM -0700, Junio C Hamano <gitster@pobox.com> wrote:\n> > The command forgot the configuration variable when rewritten in C.\n> \n> Thanks. Here is a testcase.\n\nAs far as I see this has been forgotten. Should I resend it on top of\ncurrent mv/merge-in-c?\n\nThanks.\n"}]}