X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-resolve-script;h=50d5f8336feec0eb9839a2641cb9faf9ab67391d;hb=fb2af0375bcef9f5f5cbb1f4dc9f81459ce1f4b1;hp=bf2fb2d431da4702cd2b5fe3f414ce22c7ab284d;hpb=6b38a402e97274037982a5346ca4168cc8ee026c;p=git.git diff --git a/git-resolve-script b/git-resolve-script index bf2fb2d4..50d5f833 100755 --- a/git-resolve-script +++ b/git-resolve-script @@ -4,25 +4,27 @@ # # 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"}"} +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_repo" ]; then - echo "git-resolve-script " - exit 1 +if [ -z "$head" -o -z "$merge" -o -z "$merge_msg" ]; then + usage fi dropheads @@ -31,8 +33,7 @@ echo $merge > "$GIT_DIR"/LAST_MERGE common=$(git-merge-base $head $merge) if [ -z "$common" ]; then - echo "Unable to find common commit between" $merge $head - exit 1 + die "Unable to find common commit between" $merge $head fi if [ "$common" == "$merge" ]; then @@ -50,15 +51,13 @@ if [ "$common" == "$head" ]; then fi echo "Trying to merge $merge into $head" git-read-tree -u -m $common $head $merge || exit 1 -merge_msg="Merge $merge_repo" result_tree=$(git-write-tree 2> /dev/null) if [ $? -ne 0 ]; then echo "Simple merge failed, trying Automatic merge" git-merge-cache -o git-merge-one-file-script -a if [ $? -ne 0 ]; then echo $merge > "$GIT_DIR"/MERGE_HEAD - echo "Automatic merge failed, fix up by hand" - exit 1 + die "Automatic merge failed, fix up by hand" fi result_tree=$(git-write-tree) || exit 1 fi