{"thread":{"id":"25759","subject":"cherry-pick -x formats the message incorrectly","startedAt":"2010-11-16T09:14:15Z","lastAt":"2010-11-16T21:34:00Z","messageCount":4,"participants":["Martin Svensson","Junio C Hamano","Jonathan Nieder"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"155987","messageId":"loom.20101116T100730-967@post.gmane.org","threadId":"25759","inReplyTo":null,"subject":"cherry-pick -x formats the message incorrectly","fromName":"Martin Svensson","fromEmail":"martin.k.svensson@netinsight.se","sentAt":"2010-11-16T09:14:15Z","receivedAt":"2010-11-16T09:14:15Z","isPatch":false,"sender":{"key":"martin.k.svensson@netinsight.se","avatar":null},"body":"Hello,\n\nI have a problem with the commit message format for \"cherry-pick -x\":\nGiven a commit with the message:\n\n  foo\n\n, i.e. with only a summary part, I do \"git cherry-pick -x the_commit\". The\nresult is a new commit with message\n\n  foo\n  (cherry picked from commit eb42a6475d2c2e4fff7a1b626ce6e27eec21e886)\n\nNow that's not good, because it is a two-line summary. In my opinion, the\nparentheses should _always_ end up in the detailed part.\nIt should be:\n\n  foo\n  \n  (cherry picked from commit eb42a6475d2c2e4fff7a1b626ce6e27eec21e886)\n\nAm I right?\n\n/Martin Svensson, SW Developer\n"},{"id":"156013","messageId":"7vpqu5gjmv.fsf@alter.siamese.dyndns.org","threadId":"25759","inReplyTo":"loom.20101116T100730-967@post.gmane.org","subject":"Re: cherry-pick -x formats the message incorrectly","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-11-16T19:20:56Z","receivedAt":"2010-11-16T19:20:56Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Martin Svensson <martin.k.svensson@netinsight.se> writes:\n\n> Now that's not good, because it is a two-line summary. In my opinion, the\n> parentheses should _always_ end up in the detailed part.\n> It should be:\n>\n>   foo\n>   \n>   (cherry picked from commit eb42a6475d2c2e4fff7a1b626ce6e27eec21e886)\n>\n> Am I right?\n\nI tend to agree (modulo s/summary/subject/ would be the wording I would\nhave used).\n\nThis falls into \"patches welcome\" category, though.  I do not think\nanybody sane is still using cherry-pick with -x option these days after\nhttp://thread.gmane.org/gmane.comp.version-control.git/28378\n"},{"id":"156016","messageId":"20101116193504.GB15828@burratino","threadId":"25759","inReplyTo":"7vpqu5gjmv.fsf@alter.siamese.dyndns.org","subject":"Re: cherry-pick -x formats the message incorrectly","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-11-16T19:35:04Z","receivedAt":"2010-11-16T19:35:04Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Junio C Hamano wrote:\n> Martin Svensson <martin.k.svensson@netinsight.se> writes:\n\n>> It should be:\n>>\n>>   foo\n>>   \n>>   (cherry picked from commit eb42a6475d2c2e4fff7a1b626ce6e27eec21e886)\n>>\n>> Am I right?\n>\n> I tend to agree (modulo s/summary/subject/ would be the wording I would\n> have used).\n>\n> This falls into \"patches welcome\" category, though.  I do not think\n> anybody sane is still using cherry-pick with -x option these days after\n> http://thread.gmane.org/gmane.comp.version-control.git/28378\n\nMm, I use it and do not agree; I think the rule should rather be:\n\n - if there is a Signed-off chain, quietly integrate into that (no added\n   newline)\n\n - if there is not a Signed-off chain, add the extra newline.\n\nPatch for a related issue in a few minutes.\n"},{"id":"156023","messageId":"20101116213400.GA28402@burratino","threadId":"25759","inReplyTo":"20101116193504.GB15828@burratino","subject":"Re: cherry-pick -x formats the message incorrectly","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-11-16T21:34:00Z","receivedAt":"2010-11-16T21:34:00Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Jonathan Nieder wrote:\n> Junio C Hamano wrote:\n>> Martin Svensson <martin.k.svensson@netinsight.se> writes:\n>\n>>> It should be:\n>>>\n>>>   foo\n>>>   \n>>>   (cherry picked from commit eb42a6475d2c2e4fff7a1b626ce6e27eec21e886)\n>>>\n>>> Am I right?\n>>\n>> I tend to agree (modulo s/summary/subject/ would be the wording I would\n>> have used).\n[...]\n> Mm, I use it and do not agree; I think the rule should rather be:\n> \n>  - if there is a Signed-off chain, quietly integrate into that (no added\n>    newline)\n> \n>  - if there is not a Signed-off chain, add the extra newline.\n\nHmm, probably it is obvious, but I sent this reply to the wrong message.\nSorry for the nonsense.\n\nMartin, I do agree with you and would be happy to see cherry-pick -x\nrespecting the\n\n\tOne-line subject\n\n\tPossibly multi-line, detailed description.\n\n\tSigned-off-by: chain\n\nformat.\n"}]}