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
This commit is contained in:
Junio C Hamano
2015-07-10 14:26:16 -07:00

View File

@@ -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" \