Skip to content

Commit 3f8b439

Browse files
committed
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
2 parents de62fe8 + 60d708b commit 3f8b439

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-rebase--am.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ else
7878
7979
As a result, git cannot rebase them.
8080
EOF
81-
return $?
81+
return $ret
8282
fi
8383

8484
git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \

0 commit comments

Comments
 (0)