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 43114167ad693f37e686791f2a69accded89c059..77d68d7dae4dca516974ba1d60c469f8f85ed2fb 100755 (executable)
--- 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
        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
        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
 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