From: Linus Torvalds <torvalds@ppc970.osdl.org.(none)>
Date: Tue, 19 Apr 2005 19:56:47 +0000 (-0700)
Subject: Update "git-pull-script" to use "read-tree -m" for
X-Git-Tag: v0.99~810
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8ccfbf3279b07028035aeb58baed5c4a79b63567;p=git.git

Update "git-pull-script" to use "read-tree -m" for
reading a single tree too. That should speed up a
trivial merge noticeably.

Also, don't bother reading back the tree we just wrote
when we committed a real merge. It had better be the
same one we still have..
---

diff --git a/git-pull-script b/git-pull-script
index 43114167a..77d68d7da 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -35,7 +35,7 @@ if [ "$common" == "$head" ]; then
 	echo "Destroying all noncommitted data!"
 	echo "Kill me within 3 seconds.."
 	sleep 3
-	read-tree $merge_tree && checkout-cache -f -a && update-cache --refresh
+	read-tree -m $merge_tree && checkout-cache -f -a && update-cache --refresh
 	echo $merge_head > .git/HEAD
 	exit 0
 fi
@@ -45,4 +45,4 @@ result_tree=$(write-tree) || exit 1
 result_commit=$(echo "Merge $merge_repo" | commit-tree $result_tree -p $head -p $merge_head)
 echo "Committed merge $result_commit"
 echo $result_commit > .git/HEAD
-read-tree $result_tree && checkout-cache -f -a && update-cache --refresh
+checkout-cache -f -a && update-cache --refresh