X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-resolve-script;h=b7ccc201145e543c493df79cccd2a6c9aa03e210;hb=97658004c311c54e2e4755dc545a9da261bd1441;hp=c04c0307b2b7c2b83c7707c90b844aa958a6c407;hpb=67cc5c4ef8b84961946e58bfb896c11b7fd33cc7;p=git.git

diff --git a/git-resolve-script b/git-resolve-script
index c04c0307b..b7ccc2011 100644
--- 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,
@@ -34,9 +39,9 @@ if [ "$common" == "$head" ]; then
 	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 -m $merge && git-checkout-cache -f -u -a
+	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"
@@ -49,8 +54,8 @@ if [ $? -ne 0 ]; then
 	merge_msg="Automatic merge of $merge_repo"
 	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-checkout-cache -f -u -a
+git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat