From: Clemens Buchacher <clemens.buchacher@intel.com>
Date: Thu, 2 Jul 2015 09:11:33 +0000 (+0200)
Subject: rebase: return non-zero error code if format-patch fails
X-Git-Tag: v2.5.0-rc2~12^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/60d708b220b706125b761aa4bbd82f046ef650a5?ds=inline;hp=--cc

rebase: return non-zero error code if format-patch fails

Since e481af06 (rebase: Handle cases where format-patch fails) we
notice if format-patch fails and return immediately from
git-rebase--am. We save the return value with ret=$?, but then we
return $?, which is usually zero in this case.

Fix this by returning $ret instead.

Cc: Andrew Wong <andrew.kw.w@gmail.com>
Signed-off-by: Clemens Buchacher <clemens.buchacher@intel.com>
Helped-by: Jorge Nunes <jorge.nunes@intel.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

60d708b220b706125b761aa4bbd82f046ef650a5
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index f923732333..9ae898bc1d 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -78,7 +78,7 @@ else
 
 		As a result, git cannot rebase them.
 		EOF
-		return $?
+		return $ret
 	fi
 
 	git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \