git-fetch-pack: Support multi_ack extension

[git.git] / git-merge.sh

diff --git a/git-merge.sh b/git-merge.sh
index 29e86c6..6ad96eb 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -25,8 +25,8 @@ dropsave() {
 
 savestate() {
        # Stash away any local modifications.
-       git-diff-index -r -z --name-only $head |
-       cpio -0 -o >"$GIR_DIR/MERGE_SAVE"
+       git-diff-index -z --name-only $head |
+       cpio -0 -o >"$GIT_DIR/MERGE_SAVE"
 }
 
 restorestate() {
@@ -38,10 +38,20 @@ restorestate() {
        fi
 }
 
-summary() {
+finish () {
+       test '' = "$2" || echo "$2"
+       case "$merge_msg" in
+       '')
+               echo "No merge message -- not updating HEAD"
+               ;;
+       *)
+               git-update-ref HEAD "$1" "$head" || exit 1
+               ;;
+       esac
+
        case "$no_summary" in
        '')
-               git-diff-tree -p -M $head "$1" |
+               git-diff-tree -p -M "$head" "$1" |
                git-apply --stat --summary
                ;;
        esac
@@ -103,12 +113,12 @@ echo "$head" >"$GIT_DIR/ORIG_HEAD"
 
 case "$#,$common" in
 *,'')
-       die "Unable to find common commit between $head_arg and $*"
+       # No common ancestors found. We need a real merge.
        ;;
 1,"$1")
        # If head can reach all the merge then we are up to date.
        # but first the most common case of merging one remote
-       echo "Already up-to-date. Yeeah!"
+       echo "Already up-to-date."
        dropsave
        exit 0
        ;;
@@ -116,17 +126,35 @@ case "$#,$common" in
        # Again the most common case of merging one remote.
        echo "Updating from $head to $1."
        git-update-index --refresh 2>/dev/null
-       git-read-tree -u -m $head "$1" &&
        new_head=$(git-rev-parse --verify "$1^0") &&
-       git-update-ref HEAD "$new_head" "$head" || exit 1
-       summary "$1"
+       git-read-tree -u -m $head "$new_head" &&
+       finish "$new_head" "Fast forward"
        dropsave
        exit 0
        ;;
-1,*)
+1,?*"$LF"?*)
        # We are not doing octopus and not fast forward.  Need a
        # real merge.
        ;;
+1,*)
+       # We are not doing octopus, not fast forward, and have only
+       # one common.  See if it is really trivial.
+       echo "Trying really trivial in-index merge..."
+       git-update-index --refresh 2>/dev/null
+       if git-read-tree --trivial -m -u $common $head "$1" &&
+          result_tree=$(git-write-tree)
+       then
+           echo "Wonderful."
+           result_commit=$(
+               echo "$merge_msg" |
+               git-commit-tree $result_tree -p HEAD -p "$1"
+           ) || exit
+           finish "$result_commit" "In-index merge"
+           dropsave
+           exit 0
+       fi
+       echo "Nope."
+       ;;
 *)
        # An octopus.  If we can reach all the remote we are up to date.
        up_to_date=t
@@ -217,9 +245,7 @@ then
         parents="$parents -p $remote"
     done
     result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree $parents) || exit
-    echo "Committed merge $result_commit, made by $wt_strategy."
-    git-update-ref HEAD $result_commit $head
-    summary $result_commit
+    finish "$result_commit" "Merge $result_commit, made by $wt_strategy."
     dropsave
     exit 0
 fi