X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=git-resolve-script;h=50d5f8336feec0eb9839a2641cb9faf9ab67391d;hb=fb2af0375bcef9f5f5cbb1f4dc9f81459ce1f4b1;hp=fffcb07df3d020592c79de189ea2d762b0df7232;hpb=98e031f0bb6e857c684e6db24d03d22cfc1a532a;p=git.git diff --git a/git-resolve-script b/git-resolve-script index fffcb07d..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 --revs-only "$1") -merge=$(git-rev-parse --revs-only "$2") -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