diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-18 10:39:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-18 10:39:17 -0700 |
| commit | da4e4a65a27ca912c3f48289acf9ff7a67476c3f (patch) | |
| tree | f8523544be8420fd7da3c440d7ff66220f46307f /git-pull.sh | |
| parent | d978ead4c3933425f54142f2c3fab7f5071e36ef (diff) | |
| parent | ef52aafa0f8b1d34f2ecd9b58f2198711c87cab3 (diff) | |
| download | git-da4e4a65a27ca912c3f48289acf9ff7a67476c3f.tar.xz | |
Merge branch 'maint'
* maint:
http.c: fix compiling with libcurl 7.9.2
import-tars: support symlinks
pull, rebase: simplify to use die()
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/git-pull.sh b/git-pull.sh index 35261539ab..cab367ada0 100755 --- 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 |