* [PATCH] optimize git-resolve-script
@ 2005-05-25 17:21 Jeff Garzik
0 siblings, 0 replies; only message in thread
From: Jeff Garzik @ 2005-05-25 17:21 UTC (permalink / raw)
To: Linus Torvalds, Git Mailing List
[-- Attachment #1: Type: text/plain, Size: 126 bytes --]
This change was suggested for my git-switch-tree script, so it probably
applies to core git's git-resolve-script as well.
[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 793 bytes --]
diff --git a/git-resolve-script b/git-resolve-script
--- 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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-05-25 17:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-05-25 17:21 [PATCH] optimize git-resolve-script Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).