diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-10 14:26:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-10 14:26:16 -0700 |
| commit | 8413a79e67177d026d2d8e1ac66451b80bb25d62 (patch) | |
| tree | 954019cba5244a4a135ff62258660b3d2e3a8087 | |
| parent | 1f9e0a53489aaca7859722e037a47e93858cbc42 (diff) | |
| parent | 60d708b220b706125b761aa4bbd82f046ef650a5 (diff) | |
| download | git-8413a79e67177d026d2d8e1ac66451b80bb25d62.tar.gz | |
Merge branch 'cb/rebase-am-exit-code'
"git rebase" did not exit with failure when format-patch it invoked
failed for whatever reason.
* cb/rebase-am-exit-code:
rebase: return non-zero error code if format-patch fails
| -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" \ |