Skip to content

Commit 60d708b

Browse files
Clemens Buchachergitster
authored andcommitted
rebase: return non-zero error code if format-patch fails
Since e481af0 (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>
1 parent fdf96a2 commit 60d708b

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

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)