X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-resolve-script;h=000cbb85e3ffd4be739ce0791d1afa59832aa734;hb=99977bd5fdeabbd0608a70e9411c243007ec4ea2;hp=0b04a5f6af8b97065cfe812509f2d96a600825ab;hpb=40d8cfe4117564e5520e8f4f953addaa94844476;p=git.git diff --git a/git-resolve-script b/git-resolve-script index 0b04a5f6..000cbb85 100755 --- a/git-resolve-script +++ b/git-resolve-script @@ -4,53 +4,96 @@ # # 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 +case "$common" in +"$merge") echo "Already up-to-date. Yeeah!" + dropheads exit 0 -fi -if [ "$common" == "$head" ]; then + ;; +"$head") echo "Updating from $head to $merge." 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" + ;; +esac + +# Find an optimum merge base if there are more than one candidates. +LF=' +' +common=$(git-merge-base -a $head $merge) +case "$common" in +?*"$LF"?*) + echo "Trying to find the optimum merge base." + G=.tmp-index$$ + best= + best_cnt=-1 + for c in $common + do + rm -f $G + GIT_INDEX_FILE=$G git-read-tree -m $c $head $merge \ + 2>/dev/null || continue + # Count the paths that are unmerged. + cnt=`GIT_INDEX_FILE=$G git-ls-files --unmerged | wc -l` + if test $best_cnt -le 0 -o $cnt -le $best_cnt + then + best=$c + best_cnt=$cnt + if test "$best_cnt" -eq 0 + then + # Cannot do any better than all trivial merge. + break + fi + fi + done + rm -f $G + common="$best" +esac + +echo "Trying to merge $merge into $head using $common." +git-update-cache --refresh 2>/dev/null 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 "Automatic merge failed, fix up by hand" - exit 1 + echo $merge > "$GIT_DIR"/MERGE_HEAD + die "Automatic merge failed, fix up by hand" fi result_tree=$(git-write-tree) || exit 1 fi @@ -58,4 +101,4 @@ result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $me echo "Committed merge $result_commit" echo $result_commit > "$GIT_DIR"/HEAD git-diff-tree -p $head $result_commit | git-apply --stat -rm $GIT_DIR/ORIG_HEAD $GIT_DIR/MERGE_HEAD +dropheads