{"thread":{"id":"39765","subject":"[PATCH] rebase: return non-zero error code if format-patch fails","startedAt":"2015-07-02T09:11:33Z","lastAt":"2015-07-06T17:01:28Z","messageCount":4,"participants":["Clemens Buchacher","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"265389","messageId":"20150702091133.GA13353@musxeris015.imu.intel.com","threadId":"39765","inReplyTo":null,"subject":"[PATCH] rebase: return non-zero error code if format-patch fails","fromName":"Clemens Buchacher","fromEmail":"clemens.buchacher@intel.com","sentAt":"2015-07-02T09:11:33Z","receivedAt":"2015-07-02T09:11:33Z","isPatch":true,"sender":{"key":"drizzd@gmx.net","avatar":"https://avatars.githubusercontent.com/u/59082?v=4"},"body":"Since e481af06 (rebase: Handle cases where format-patch fails) we\nnotice if format-patch fails and return immediately from\ngit-rebase--am. We save the return value with ret=$?, but then we\nreturn $?, which is usually zero in this case.\n\nFix this by returning $ret instead.\n\nCc: Andrew Wong \nSigned-off-by: Clemens Buchacher \nReviewed-by: Jorge Nunes \n---\n git-rebase--am.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/git-rebase--am.sh b/git-rebase--am.sh\nindex f923732..9ae898b 100644\n--- a/git-rebase--am.sh\n+++ b/git-rebase--am.sh\n@@ -78,7 +78,7 @@ else\n \n \t\tAs a result, git cannot rebase them.\n \t\tEOF\n-\t\treturn $?\n+\t\treturn $ret\n \tfi\n \n \tgit am $git_am_opt --rebasing --resolvemsg=\"$resolvemsg\" \\\n-- \n1.9.4\n"},{"id":"265471","messageId":"xmqqpp493z8f.fsf@gitster.dls.corp.google.com","threadId":"39765","inReplyTo":"20150702091133.GA13353@musxeris015.imu.intel.com","subject":"Re: [PATCH] rebase: return non-zero error code if format-patch fails","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-07-03T17:52:32Z","receivedAt":"2015-07-03T17:52:32Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Clemens Buchacher writes:\n\n> Since e481af06 (rebase: Handle cases where format-patch fails) we\n> notice if format-patch fails and return immediately from\n> git-rebase--am. We save the return value with ret=$?, but then we\n> return $?, which is usually zero in this case.\n>\n> Fix this by returning $ret instead.\n\nSounds sensible.\n\n>\n> Cc: Andrew Wong \n> Signed-off-by: Clemens Buchacher \n> Reviewed-by: Jorge Nunes \n\nWhere was this review made? I may have missed a recent discussion,\nand that is why I am asking, because Reviewed-by: lines that cannot\nbe validated by going back to the list archive does not add much\nvalue.\n\nThanks.\n\n> ---\n> git-rebase--am.sh | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/git-rebase--am.sh b/git-rebase--am.sh\n> index f923732..9ae898b 100644\n> --- a/git-rebase--am.sh\n> +++ b/git-rebase--am.sh\n> @@ -78,7 +78,7 @@ else\n> \n> \t\tAs a result, git cannot rebase them.\n> \t\tEOF\n> -\t\treturn $?\n> +\t\treturn $ret\n> \tfi\n> \n> \tgit am $git_am_opt --rebasing --resolvemsg=\"$resolvemsg\" \\\n"},{"id":"265545","messageId":"20150706085326.GA30731@musxeris015.imu.intel.com","threadId":"39765","inReplyTo":"xmqqpp493z8f.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH] rebase: return non-zero error code if format-patch fails","fromName":"Clemens Buchacher","fromEmail":"clemens.buchacher@intel.com","sentAt":"2015-07-06T08:53:26Z","receivedAt":"2015-07-06T08:53:26Z","isPatch":true,"sender":{"key":"drizzd@gmx.net","avatar":"https://avatars.githubusercontent.com/u/59082?v=4"},"body":"On Fri, Jul 03, 2015 at 10:52:32AM -0700, Junio C Hamano wrote:\n> >\n> > Cc: Andrew Wong \n> > Signed-off-by: Clemens Buchacher \n> > Reviewed-by: Jorge Nunes \n> \n> Where was this review made? I may have missed a recent discussion,\n> and that is why I am asking, because Reviewed-by: lines that cannot\n> be validated by going back to the list archive does not add much\n> value.\n\nJorge helped me by reviewing the patch before I submitted it to the\nlist. My intention is to give credit for his contribution, and to\ninvolve him in any discussion regarding the patch. Maybe it makes more\nsense to say Helped-by:? Please feel free to change as you see fit. I\nwill follow your recommendation in the future.\n\nThanks.\n"},{"id":"265573","messageId":"xmqq1tgl2pav.fsf@gitster.dls.corp.google.com","threadId":"39765","inReplyTo":"20150706085326.GA30731@musxeris015.imu.intel.com","subject":"Re: [PATCH] rebase: return non-zero error code if format-patch fails","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-07-06T17:01:28Z","receivedAt":"2015-07-06T17:01:28Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Clemens Buchacher writes:\n\n> On Fri, Jul 03, 2015 at 10:52:32AM -0700, Junio C Hamano wrote:\n>> >\n>> > Cc: Andrew Wong \n>> > Signed-off-by: Clemens Buchacher \n>> > Reviewed-by: Jorge Nunes \n>> \n>> Where was this review made? I may have missed a recent discussion,\n>> and that is why I am asking, because Reviewed-by: lines that cannot\n>> be validated by going back to the list archive does not add much\n>> value.\n>\n> Jorge helped me by reviewing the patch before I submitted it to the\n> list. My intention is to give credit for his contribution, and to\n> involve him in any discussion regarding the patch. Maybe it makes more\n> sense to say Helped-by:?\n\nThanks; I think that clarifies it, and I think that is how people\nseem to use Helped-by around here.\n"}]}