diff options
| author | Clemens Buchacher <clemens.buchacher@intel.com> | 2015-07-02 11:11:33 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-08 15:36:42 -0700 |
| commit | 60d708b220b706125b761aa4bbd82f046ef650a5 (patch) | |
| tree | c1561f0aa70ef39d34f4d98040015e9b4d840874 | |
| parent | fdf96a20acf96a6ac538df8113b2aafd6ed71d50 (diff) | |
| download | git-60d708b220b706125b761aa4bbd82f046ef650a5.tar.gz | |
rebase: return non-zero error code if format-patch failscb/rebase-am-exit-code
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>
| -rw-r--r-- | git-rebase--am.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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" \ |