summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2009-06-14 16:08:56 -0700
committerJunio C Hamano <gitster@pobox.com>2009-06-14 21:14:10 -0700
commitbc2bbc4542a220da5d28c432b6bf78a845a421c0 (patch)
tree99249dab196dbb09a8baec21f4d39e8963078be9 /git-pull.sh
parent50a991ec46d57ffc4b7fbd0e8a13182dab3cd5de (diff)
downloadgit-bc2bbc4542a220da5d28c432b6bf78a845a421c0.tar.gz
pull, rebase: simplify to use die()
Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh6
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