From 165e160e4c4fb5b03146d5c41c2f6b078260b098 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 20 Aug 2005 01:21:21 -0700 Subject: [PATCH] git-resolve: dying is good, not showing help is bad. Recent change to make sure we get commit, not tag, accidentally removed its feature of giving a usage help message when it died. Signed-off-by: Junio C Hamano --- git-resolve-script | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/git-resolve-script b/git-resolve-script index 4641119e..50d5f833 100755 --- a/git-resolve-script +++ b/git-resolve-script @@ -6,21 +6,25 @@ # . git-sh-setup-script || die "Not a git archive" -head=$(git-rev-parse --verify "$1"^0) || exit -merge=$(git-rev-parse --verify "$2"^0) || exit -merge_msg="$3" +usage () { + die "git-resolve-script " +} dropheads() { rm -f -- "$GIT_DIR/MERGE_HEAD" \ "$GIT_DIR/LAST_MERGE" || exit 1 } +head=$(git-rev-parse --verify "$1"^0) && +merge=$(git-rev-parse --verify "$2"^0) && +merge_msg="$3" || usage + # # The remote name is just used for the message, # but we do want it. # if [ -z "$head" -o -z "$merge" -o -z "$merge_msg" ]; then - die "git-resolve-script " + usage fi dropheads -- 2.11.0