Re: git pull fails to exit with non-zero status after fatal error
I'll give it a try and let you know.
Thanks for the quick feedback.
Larry.
Johannes Schindelin wrote:
Show 18 quoted lines
> Does this fix it?
>
> diff --git a/git-merge.sh b/git-merge.sh
> index 498c938..6b23bf5 100755
> --- a/git-merge.sh
> +++ b/git-merge.sh
> @@ -295,8 +295,9 @@ f,*)
> new_head=$(git-rev-parse --verify "$1^0") &&
> git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
> finish "$new_head" "Fast forward"
> + ret=$?
> dropsave
> - exit 0
> + exit $ret
> ;;
> ?,1,?*"$LF"?*,*)
> # We are not doing octopus and not fast forward. Need a
>