X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=git-resolve-script;h=fffcb07df3d020592c79de189ea2d762b0df7232;hb=52f28529f4f90cebdca47f8eacbff5cb20004bed;hp=bf2fb2d431da4702cd2b5fe3f414ce22c7ab284d;hpb=b43d44779bf98977b211256f936d0edda8a9625a;p=git.git diff --git a/git-resolve-script b/git-resolve-script index bf2fb2d4..fffcb07d 100755 --- a/git-resolve-script +++ b/git-resolve-script @@ -4,12 +4,11 @@ # # Resolve two trees. # +. git-sh-setup-script || die "Not a git archive" + head=$(git-rev-parse --revs-only "$1") merge=$(git-rev-parse --revs-only "$2") -merge_repo="$3" - -: ${GIT_DIR=.git} -: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"} +merge_msg="$3" dropheads() { rm -f -- "$GIT_DIR/MERGE_HEAD" \ @@ -20,9 +19,8 @@ dropheads() { # The remote name is just used for the message, # but we do want it. # -if [ -z "$head" -o -z "$merge" -o -z "$merge_repo" ]; then - echo "git-resolve-script