X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-resolve-script;h=50d5f8336feec0eb9839a2641cb9faf9ab67391d;hb=fb2af0375bcef9f5f5cbb1f4dc9f81459ce1f4b1;hp=186b234b24e2581c3db9864a751b7e6c9e837c56;hpb=220a0b527bd6ecd30a9d6dfed22195c95e6f445a;p=git.git diff --git a/git-resolve-script b/git-resolve-script old mode 100644 new mode 100755 index 186b234b..50d5f833 --- a/git-resolve-script +++ b/git-resolve-script @@ -4,57 +4,65 @@ # # 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"}"} +usage () { + die "git-resolve-script " +} -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 +} + +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 [ "$merge_repo" == "" ]; then - echo "git-resolve-script " - exit 1 +if [ -z "$head" -o -z "$merge" -o -z "$merge_msg" ]; then + usage 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 -u -m $head $merge || exit 1 echo $merge > "$GIT_DIR"/HEAD - git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat + git-diff-tree -p $head $merge | git-apply --stat + dropheads exit 0 fi echo "Trying to merge $merge into $head" git-read-tree -u -m $common $head $merge || exit 1 -merge_msg="Merge of $merge_repo" 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-diff-tree -p ORIG_HEAD HEAD | git-apply --stat +git-diff-tree -p $head $result_commit | git-apply --stat +dropheads