{"thread":{"id":"30280","subject":"[PATCH] sequencer: remove additional blank line","startedAt":"2012-04-18T21:07:25Z","lastAt":"2012-04-19T22:38:11Z","messageCount":2,"participants":["Ralf Thielow","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"189663","messageId":"1334783245-8733-1-git-send-email-ralf.thielow@googlemail.com","threadId":"30280","inReplyTo":null,"subject":"[PATCH] sequencer: remove additional blank line","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@googlemail.com","sentAt":"2012-04-18T21:07:25Z","receivedAt":"2012-04-18T21:07:25Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"Remove an additional blank line between the\nheadline and the list of conflicted files after\ndoing a recursive merge.\n\nSigned-off-by: Ralf Thielow <ralf.thielow@googlemail.com>\n---\nNormally, the list of conflicted files come directly after\nthe headline like this\n\n    Conflicts:\n        folder/file\n\t...\n\nWithout this patch it would looks like this:\n\n    Conflicts:\n\n        folder/file\n\t...\n\n sequencer.c |    2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/sequencer.c b/sequencer.c\nindex a37846a..f6e44b8 100644\n--- a/sequencer.c\n+++ b/sequencer.c\n@@ -234,7 +234,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,\n \n \tif (!clean) {\n \t\tint i;\n-\t\tstrbuf_addstr(msgbuf, \"\\nConflicts:\\n\\n\");\n+\t\tstrbuf_addstr(msgbuf, \"\\nConflicts:\\n\");\n \t\tfor (i = 0; i < active_nr;) {\n \t\t\tstruct cache_entry *ce = active_cache[i++];\n \t\t\tif (ce_stage(ce)) {\n-- \n1.7.10.170.gac579\n"},{"id":"189729","messageId":"xmqq8vhruz3g.fsf@junio.mtv.corp.google.com","threadId":"30280","inReplyTo":"1334783245-8733-1-git-send-email-ralf.thielow@googlemail.com","subject":"Re: [PATCH] sequencer: remove additional blank line","fromName":"Junio C Hamano","fromEmail":"jch@google.com","sentAt":"2012-04-19T22:38:11Z","receivedAt":"2012-04-19T22:38:11Z","isPatch":true,"sender":{"key":"jch@google.com","avatar":null},"body":"Ralf Thielow <ralf.thielow@googlemail.com> writes:\n\n> Remove an additional blank line between the\n> headline and the list of conflicted files after\n> doing a recursive merge.\n>\n> Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>\n> ---\n> Normally, the list of conflicted files come directly after\n> the headline like this\n>\n>     Conflicts:\n>         folder/file\n> \t...\n\nHrm.\n\nA funny thing is that your \"Normally\" is a misconception caused by a\nregression in 1c7b76be (Build in merge, Jul 7, 2008).  Before that\nchange, this message was \"Conflicts:\" followed by an empty line and it\nwas consistently so between \"merge\" and \"cherry-pick\", but the C rewrite\nof \"git merge\" broke it.\n\nI do not care deeply either way; unifying them again to use one less\nline is probably fine.\n"}]}