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>
Clemens Buchacher committed
Jul 2, 2015 at 11:11 UTC
60d708b220b706125b761aa4bbd82f046ef650a5
1 file changed
+1
-1
git-rebase--am.sh
+1
-1
@@ -78,7 +78,7 @@ else
78
79
As a result, git cannot rebase them.
80
EOF
81
- return $?
81
+ return $ret
82
fi
83
84
git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \