git-apply: normalize file mode when comparing with expected value

diff --git a/git-resolve-script b/git-resolve-script
index c04c0307b2b7c2b83c7707c90b844aa958a6c407..0b04a5f6af8b97065cfe812509f2d96a600825ab 100644 (file)
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -1,14 +1,19 @@
 #!/bin/sh
 #
+# Copyright (c) 2005 Linus Torvalds
+#
 # Resolve two trees.
 #
 head="$1"
 merge="$2"
 merge_repo="$3"
 
-rm -f .git/MERGE_HEAD .git/ORIG_HEAD
-echo $head > .git/ORIG_HEAD
-echo $merge > .git/MERGE_HEAD
+: ${GIT_DIR=.git}
+: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
+
+rm -f "$GIT_DIR"/MERGE_HEAD "$GIT_DIR"/ORIG_HEAD
+echo $head > "$GIT_DIR"/ORIG_HEAD
+echo $merge > "$GIT_DIR"/MERGE_HEAD
 
 #
 # The remote name is just used for the message,
@@ -31,26 +36,26 @@ if [ "$common" == "$merge" ]; then
 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
-       echo $merge > .git/HEAD
-       git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1
+       git-read-tree -u -m $head $merge || exit 1
+       echo $merge > "$GIT_DIR"/HEAD
+       git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat
        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
+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 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 "Automatic merge failed, fix up by hand"
+               exit 1
+       fi
        result_tree=$(git-write-tree) || exit 1
 fi
-result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge_head)
+result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
 echo "Committed merge $result_commit"
-echo $result_commit > .git/HEAD
-git-checkout-cache -f -a && git-update-cache --refresh
-git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1
+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