Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Clemens Buchacher authored and Junio C Hamano committed Jul 8, 2015
1 parent fdf96a2 commit 60d708b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-rebase--am.sh
Expand Up @@ -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" \
Expand Down

0 comments on commit 60d708b

Please sign in to comment.