X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=git-resolve-script;h=fffcb07df3d020592c79de189ea2d762b0df7232;hb=9153368d1bc296b6dbd0c3606a04a7274c6edc7e;hp=ec646fbb915d932cad66d8b4bd7457d844b7dd38;hpb=f1a7eb36b017c62d9a007b6b8660bdeec3f94f97;p=git.git diff --git a/git-resolve-script b/git-resolve-script old mode 100644 new mode 100755 index ec646fbb..fffcb07d --- a/git-resolve-script +++ b/git-resolve-script @@ -4,58 +4,61 @@ # # Resolve two trees. # -head="$1" -merge="$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 --revs-only "$1") +merge=$(git-rev-parse --revs-only "$2") +merge_msg="$3" -rm -f "$GIT_DIR"/MERGE_HEAD "$GIT_DIR"/ORIG_HEAD -echo $head > "$GIT_DIR"/ORIG_HEAD -echo $merge > "$GIT_DIR"/MERGE_HEAD +dropheads() { + rm -f -- "$GIT_DIR/MERGE_HEAD" \ + "$GIT_DIR/LAST_MERGE" || exit 1 +} # # The remote name is just used for the message, # but we do want it. # -if [ "$merge_repo" == "" ]; then - echo "git-resolve-script " - exit 1 +if [ -z "$head" -o -z "$merge" -o -z "$merge_msg" ]; then + die "git-resolve-script " fi +dropheads +echo $head > "$GIT_DIR"/ORIG_HEAD +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 echo "Already up-to-date. Yeeah!" + dropheads exit 0 fi if [ "$common" == "$head" ]; then echo "Updating from $head to $merge." - echo "Destroying all noncommitted data!" - echo "Kill me within 3 seconds.." - sleep 3 - git-read-tree -m $merge && git-checkout-cache -f -a && git-update-cache --refresh + git-read-tree -u -m $head $merge || exit 1 echo $merge > "$GIT_DIR"/HEAD - git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1 + git-diff-tree -p $head $merge | git-apply --stat + dropheads exit 0 fi echo "Trying to merge $merge into $head" -git-read-tree -m $common $head $merge -merge_msg="Merge of $merge_repo" +git-read-tree -u -m $common $head $merge || exit 1 result_tree=$(git-write-tree 2> /dev/null) if [ $? -ne 0 ]; then echo "Simple merge failed, trying Automatic merge" - git-merge-cache git-merge-one-file-script -a - merge_msg="Automatic merge of $merge_repo" + git-merge-cache -o git-merge-one-file-script -a + if [ $? -ne 0 ]; then + echo $merge > "$GIT_DIR"/MERGE_HEAD + die "Automatic merge failed, fix up by hand" + fi result_tree=$(git-write-tree) || exit 1 fi result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge) echo "Committed merge $result_commit" echo $result_commit > "$GIT_DIR"/HEAD -git-checkout-cache -f -a && git-update-cache --refresh -git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1 +git-diff-tree -p $head $result_commit | git-apply --stat +dropheads