diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-27 12:21:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-27 12:21:39 -0700 |
| commit | 3f8b439a0e7cb808a24679a154cf6b76d8a8bc89 (patch) | |
| tree | 5c88cfb5fc934695da1072ca6fa9eff97d7df755 | |
| parent | de62fe8c421344c34d375fc315f33eeb584ab538 (diff) | |
| parent | 60d708b220b706125b761aa4bbd82f046ef650a5 (diff) | |
| download | git-3f8b439a0e7cb808a24679a154cf6b76d8a8bc89.tar.gz | |
Merge branch 'cb/rebase-am-exit-code' into maint
"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" \ |