{"thread":{"id":"713","subject":"[PATCH] optimize git-resolve-script","startedAt":"2005-05-25T17:21:09Z","lastAt":"2005-05-25T17:21:09Z","messageCount":1,"participants":["Jeff Garzik"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"3935","messageId":"4294B405.80205@pobox.com","threadId":"713","inReplyTo":null,"subject":"[PATCH] optimize git-resolve-script","fromName":"Jeff Garzik","fromEmail":"jgarzik@pobox.com","sentAt":"2005-05-25T17:21:09Z","receivedAt":"2005-05-25T17:21:09Z","isPatch":true,"sender":{"key":"jgarzik@pobox.com","avatar":null},"body":"\nThis change was suggested for my git-switch-tree script, so it probably \napplies to core git's git-resolve-script as well.\n\n\n\n\ndiff --git a/git-resolve-script b/git-resolve-script\n--- a/git-resolve-script\n+++ b/git-resolve-script\n@@ -39,7 +39,7 @@ if [ \"$common\" == \"$head\" ]; then\n \techo \"Destroying all noncommitted data!\"\n \techo \"Kill me within 3 seconds..\"\n \tsleep 3\n-\tgit-read-tree -m $merge && git-checkout-cache -f -a && git-update-cache --refresh\n+\tgit-read-tree -m $merge && git-checkout-cache -f -u -a\n \techo $merge > \"$GIT_DIR\"/HEAD\n \tgit-diff-tree -p ORIG_HEAD HEAD | diffstat -p1\n \texit 0\n@@ -57,5 +57,5 @@ fi\n result_commit=$(echo \"$merge_msg\" | git-commit-tree $result_tree -p $head -p $merge)\n echo \"Committed merge $result_commit\"\n echo $result_commit > \"$GIT_DIR\"/HEAD\n-git-checkout-cache -f -a && git-update-cache --refresh\n+git-checkout-cache -f -u -a\n git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1\n"}]}