{"thread":{"id":"17376","subject":"[PATCH v2] Allow format-patch to create patches for merges","startedAt":"2009-01-26T16:43:32Z","lastAt":"2009-01-26T19:34:02Z","messageCount":2,"participants":["Nathan W. Panike","Sverre Rabbelier"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"102004","messageId":"1232988212-8613-1-git-send-email-nathan.panike@gmail.com","threadId":"17376","inReplyTo":null,"subject":"[PATCH v2] Allow format-patch to create patches for merges","fromName":"Nathan W. Panike","fromEmail":"nathan.panike@gmail.com","sentAt":"2009-01-26T16:43:32Z","receivedAt":"2009-01-26T16:43:32Z","isPatch":true,"sender":{"key":"nathan.panike@gmail.com","avatar":"https://avatars.githubusercontent.com/u/389447?v=4"},"body":"The behavior for git format-patch is to ignore merge commits, producing an\nempty patch.  The code does not allow the user to change this behavior. This\npatch changes that behavior by allowing the user to specify -c or -m at the\ncommand line to produce a patch for a merge commit.\n\nSigned-off-by: Nathan W. Panike <nathan.panike@gmail.com>\n---\nAdd Sign off.\n\nThis seems to solve my problem, but maybe my workflow is sufficiently different\nthat it is a problem no one else has. Maybe someone can point me in a direction\nthat solves problems more users have.\n\nThanks,\n\nNathan Panike\n builtin-log.c |    4 ----\n 1 files changed, 0 insertions(+), 4 deletions(-)\n\ndiff --git a/builtin-log.c b/builtin-log.c\nindex 2ae39af..ea4729d 100644\n--- a/builtin-log.c\n+++ b/builtin-log.c\n@@ -994,10 +994,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)\n \t\t\tcontinue;\n \t\t}\n \n-\t\t/* ignore merges */\n-\t\tif (commit->parents && commit->parents->next)\n-\t\t\tcontinue;\n-\n \t\tif (ignore_if_in_upstream &&\n \t\t\t\thas_commit_patch_id(commit, &ids))\n \t\t\tcontinue;\n-- \n1.6.1.1.GIT\n"},{"id":"102030","messageId":"bd6139dc0901261134n1ad61992t64d36135a6756eaa@mail.gmail.com","threadId":"17376","inReplyTo":"1232988212-8613-1-git-send-email-nathan.panike@gmail.com","subject":"Re: [PATCH v2] Allow format-patch to create patches for merges","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2009-01-26T19:34:02Z","receivedAt":"2009-01-26T19:34:02Z","isPatch":true,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"On Mon, Jan 26, 2009 at 17:43, Nathan W. Panike <nathan.panike@gmail.com> wrote:\n> This seems to solve my problem, but maybe my workflow is sufficiently different\n> that it is a problem no one else has. Maybe someone can point me in a direction\n> that solves problems more users have.\n\nIt seems like you want to use bundles instead of patches? Since you're\nusing it just to propagate your changes...?\n\n-- \nCheers,\n\nSverre Rabbelier\n"}]}