X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-resolve-script;h=52dd83bae0d6ca95cc083cd6df06a289c51558a5;hb=b55db7ba283c1f7d2ff3cbc7e351d3ae504c9b1d;hp=bf2fb2d431da4702cd2b5fe3f414ce22c7ab284d;hpb=85c1f337be49eaa9a22e42a1c9958deef5ab57c3;p=git.git diff --git a/git-resolve-script b/git-resolve-script index bf2fb2d43..52dd83bae 100755 --- a/git-resolve-script +++ b/git-resolve-script @@ -4,12 +4,11 @@ # # Resolve two trees. # -head=$(git-rev-parse --revs-only "$1") -merge=$(git-rev-parse --revs-only "$2") -merge_repo="$3" +. git-sh-setup-script || die "Not a git archive" -: ${GIT_DIR=.git} -: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"} +head=$(git-rev-parse --verify "$1") +merge=$(git-rev-parse --verify "$2") +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