{"thread":{"id":"33511","subject":"[PATCH] rebase-am: fix regression with new cover-letter config","startedAt":"2013-04-14T22:27:04Z","lastAt":"2013-04-15T02:57:05Z","messageCount":5,"participants":["Felipe Contreras","Junio C Hamano","Eric Sunshine"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"214234","messageId":"1365978424-11841-1-git-send-email-felipe.contreras@gmail.com","threadId":"33511","inReplyTo":null,"subject":"[PATCH] rebase-am: fix regression with new cover-letter config","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-04-14T22:27:04Z","receivedAt":"2013-04-14T22:27:04Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"If you have a cover-letter configuration set to anything other than\n'false', 'git format-patch' might generate a cover letter, and 'git am'\ndoesn't seem to like that.\n\nIdeally 'git am' should skip the cover-letter, but for now lets just fix\nthe regression.\n\nSigned-off-by: Felipe Contreras \n---\n git-rebase--am.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-rebase--am.sh b/git-rebase--am.sh\nindex 97f31dc..f84854f 100644\n--- a/git-rebase--am.sh\n+++ b/git-rebase--am.sh\n@@ -31,8 +31,8 @@ else\n \trm -f \"$GIT_DIR/rebased-patches\"\n \n \tgit format-patch -k --stdout --full-index --ignore-if-in-upstream \\\n-\t\t--src-prefix=a/ --dst-prefix=b/ \\\n-\t\t--no-renames $root_flag \"$revisions\" >\"$GIT_DIR/rebased-patches\"\n+\t\t--src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \\\n+\t\t$root_flag \"$revisions\" >\"$GIT_DIR/rebased-patches\"\n \tret=$?\n \n \tif test 0 != $ret\n-- \n1.8.2.1.643.ge3cc75d\n"},{"id":"214252","messageId":"7vhaj84l8m.fsf@alter.siamese.dyndns.org","threadId":"33511","inReplyTo":"1365978424-11841-1-git-send-email-felipe.contreras@gmail.com","subject":"Re: [PATCH] rebase-am: fix regression with new cover-letter config","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-15T01:48:41Z","receivedAt":"2013-04-15T01:48:41Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Felipe Contreras writes:\n\n> If you have a cover-letter configuration set to anything other than\n> 'false', 'git format-patch' might generate a cover letter, and 'git am'\n> doesn't seem to like that.\n>\n> Ideally 'git am' should skip the cover-letter, but for now lets just fix\n> the regression.\n>\n> Signed-off-by: Felipe Contreras \n> ---\n\nThis is a follow-up to the fc/send-email-annotate topic, right?\n\nYou are mean to say \"fix regression\", which gave me a small heart\nattack ;-). I was worried if we had already merged it to 'next'.\n\nAs I already wrote in the recent \"What's cooking\", the series looks\ngood to me. I am inclined to say that we should merge it (together\nwith this update) to 'next'.\n\nThanks for catching this before breaking the real world users.\n\n> git-rebase--am.sh | 4 ++--\n> 1 file changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/git-rebase--am.sh b/git-rebase--am.sh\n> index 97f31dc..f84854f 100644\n> --- a/git-rebase--am.sh\n> +++ b/git-rebase--am.sh\n> @@ -31,8 +31,8 @@ else\n> \trm -f \"$GIT_DIR/rebased-patches\"\n> \n> \tgit format-patch -k --stdout --full-index --ignore-if-in-upstream \\\n> -\t\t--src-prefix=a/ --dst-prefix=b/ \\\n> -\t\t--no-renames $root_flag \"$revisions\" >\"$GIT_DIR/rebased-patches\"\n> +\t\t--src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \\\n> +\t\t$root_flag \"$revisions\" >\"$GIT_DIR/rebased-patches\"\n> \tret=$?\n> \n> \tif test 0 != $ret\n"},{"id":"214256","messageId":"CAMP44s0GbocoBrONYdiN6f=qd58xbX0Y4neGSVRmCiLRr_f8Jw@mail.gmail.com","threadId":"33511","inReplyTo":"7vhaj84l8m.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] rebase-am: fix regression with new cover-letter config","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-04-15T02:31:26Z","receivedAt":"2013-04-15T02:31:26Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Sun, Apr 14, 2013 at 8:48 PM, Junio C Hamano wrote:\n> Felipe Contreras writes:\n>\n>> If you have a cover-letter configuration set to anything other than\n>> 'false', 'git format-patch' might generate a cover letter, and 'git am'\n>> doesn't seem to like that.\n>>\n>> Ideally 'git am' should skip the cover-letter, but for now lets just fix\n>> the regression.\n>>\n>> Signed-off-by: Felipe Contreras \n>> ---\n>\n> This is a follow-up to the fc/send-email-annotate topic, right?\n\nRight.\n\n> You are mean to say \"fix regression\", which gave me a small heart\n> attack ;-). I was worried if we had already merged it to 'next'.\n>\n> As I already wrote in the recent \"What's cooking\", the series looks\n> good to me. I am inclined to say that we should merge it (together\n> with this update) to 'next'.\n\nYeah, after thinking about it, it's not even really a regression,\nbecause people don't have format.coverletter=auto in their configs\n(yet), so the bug can't can possibly affect them.\n\n> Thanks for catching this before breaking the real world users.\n\nI'm running 'next' as you suggested we should do, along with all my\npatches, so that helps :)\n\nCheers.\n\n-- \nFelipe Contreras\n"},{"id":"214259","messageId":"7v1uac4icp.fsf@alter.siamese.dyndns.org","threadId":"33511","inReplyTo":"CAMP44s0GbocoBrONYdiN6f=qd58xbX0Y4neGSVRmCiLRr_f8Jw@mail.gmail.com","subject":"Re: [PATCH] rebase-am: fix regression with new cover-letter config","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-15T02:51:02Z","receivedAt":"2013-04-15T02:51:02Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Felipe Contreras writes:\n\n>> You are mean to say \"fix regression\", which gave me a small heart\n>> attack ;-). I was worried if we had already merged it to 'next'.\n>>\n>> As I already wrote in the recent \"What's cooking\", the series looks\n>> good to me. I am inclined to say that we should merge it (together\n>> with this update) to 'next'.\n>\n> Yeah, after thinking about it, it's not even really a regression,\n> because people don't have format.coverletter=auto in their configs\n> (yet), so the bug can't can possibly affect them.\n\nHere is what I tentatively queued.\n\n rebase-am: explicitly disable cover-letter\n \n If the user has a cover-letter configuration set to anything\n other than 'false', 'git format-patch' may generate a cover\n letter, which has no place in \"format-patch | am\" pipeline.\n \n The internal invocatoin of format-patch must explicitly override\n the configuration from the command line, just like --src-prefix\n and other options already do.\n \n Signed-off-by: Felipe Contreras \n Signed-off-by: Junio C Hamano \n"},{"id":"214261","messageId":"CAPig+cQXaZ_pdOn1RtANdQnYrOaRvpbS2kpCYDq1Gej1w5j=jQ@mail.gmail.com","threadId":"33511","inReplyTo":"7v1uac4icp.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] rebase-am: fix regression with new cover-letter config","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2013-04-15T02:57:05Z","receivedAt":"2013-04-15T02:57:05Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Sun, Apr 14, 2013 at 10:51 PM, Junio C Hamano wrote:\n> Here is what I tentatively queued.\n>\n> rebase-am: explicitly disable cover-letter\n>\n> If the user has a cover-letter configuration set to anything\n> other than 'false', 'git format-patch' may generate a cover\n> letter, which has no place in \"format-patch | am\" pipeline.\n>\n> The internal invocatoin of format-patch must explicitly override\n\ns/invocatoin/invocation/\n\n> the configuration from the command line, just like --src-prefix\n> and other options already do.\n>\n> Signed-off-by: Felipe Contreras \n> Signed-off-by: Junio C Hamano \n"}]}