summaryrefslogtreecommitdiff
path: root/git-rebase--am.sh
diff options
context:
space:
mode:
authorClemens Buchacher <clemens.buchacher@intel.com>2015-07-02 09:11:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-07-08 22:36:42 (GMT)
commit60d708b220b706125b761aa4bbd82f046ef650a5 (patch)
treec1561f0aa70ef39d34f4d98040015e9b4d840874 /git-rebase--am.sh
parentfdf96a20acf96a6ac538df8113b2aafd6ed71d50 (diff)
downloadgit-60d708b220b706125b761aa4bbd82f046ef650a5.zip
git-60d708b220b706125b761aa4bbd82f046ef650a5.tar.gz
git-60d708b220b706125b761aa4bbd82f046ef650a5.tar.bz2
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>
Diffstat (limited to 'git-rebase--am.sh')
-rw-r--r--git-rebase--am.sh2
1 files changed, 1 insertions, 1 deletions
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" \