Merge branch 'sb/maint-1.6.0-add-config-fix' into maint

[git.git] / git-pull.sh

diff --git a/git-pull.sh b/git-pull.sh
index 35261539ab80ffa46fef945dce1a82c5636c1b49..cab367ada009659da23774ec303119af3d972038 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -176,13 +176,11 @@ case "$merge_head" in
 ?*' '?*)
        if test -z "$orig_head"
        then
-               echo >&2 "Cannot merge multiple branches into empty head"
-               exit 1
+               die "Cannot merge multiple branches into empty head"
        fi
        if test true = "$rebase"
        then
-               echo >&2 "Cannot rebase onto multiple branches"
-               exit 1
+               die "Cannot rebase onto multiple branches"
        fi
        ;;
 esac