From ea88ee46de82bf1e398d0cfef05e3dcdf48b1b88 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 25 May 2005 13:21:09 -0400
Subject: [PATCH] optimize git-resolve-script

This change was suggested for my git-switch-tree script, and the same
issues apply to core git's git-resolve-script as well.

diff --git a/git-resolve-script b/git-resolve-script
index ec646fb..5f1a748 100644
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -39,7 +39,7 @@ 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
+	git-read-tree -m $merge && git-checkout-cache -f -u -a
 	echo $merge > "$GIT_DIR"/HEAD
 	git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1
 	exit 0
@@ -57,5 +57,5 @@ fi
 result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
 echo "Committed merge $result_commit"
 echo $result_commit > "$GIT_DIR"/HEAD
-git-checkout-cache -f -a && git-update-cache --refresh
+git-checkout-cache -f -u -a
 git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1
-- 
cgit v0.10.2-6-g49f6