From bc2bbc4542a220da5d28c432b6bf78a845a421c0 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Sun, 14 Jun 2009 16:08:56 -0700 Subject: [PATCH] pull, rebase: simplify to use die() Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano --- git-pull.sh | 6 ++---- git-rebase.sh | 9 +++------ 2 files changed, 5 insertions(+), 10 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 diff --git a/git-rebase.sh b/git-rebase.sh index b83fd3f970..334629fc97 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -168,10 +168,8 @@ run_pre_rebase_hook () { if test -z "$OK_TO_SKIP_PRE_REBASE" && test -x "$GIT_DIR/hooks/pre-rebase" then - "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} || { - echo >&2 "The pre-rebase hook refused to rebase." - exit 1 - } + "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} || + die "The pre-rebase hook refused to rebase." fi } @@ -359,8 +357,7 @@ fi # The tree must be really really clean. if ! git update-index --ignore-submodules --refresh; then - echo >&2 "cannot rebase: you have unstaged changes" - exit 1 + die "cannot rebase: you have unstaged changes" fi diff=$(git diff-index --cached --name-status -r --ignore-submodules HEAD --) case "$diff" in -- 2.11.4.GIT