[PATCH] rebase: return non-zero error code if format-patch fails
- From
Clemens Buchacher <clemens.buchacher@intel.com>
- Date
- Jul 2, 2015, 09:11 UTC
- Message-ID
- <20150702091133.GA13353@musxeris015.imu.intel.com>
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> Reviewed-by: Jorge Nunes <jorge.nunes@intel.com> --- git-rebase--am.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-rebase--am.sh b/git-rebase--am.sh index f923732..9ae898b 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" \
-- 1.9.4