summaryrefslogtreecommitdiff
path: root/git-resolve-script
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-05-25 17:21:09 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-25 18:59:37 (GMT)
commitea88ee46de82bf1e398d0cfef05e3dcdf48b1b88 (patch)
tree4830c5a85f19b1a621dd695131b7593257718678 /git-resolve-script
parent6f93a631acd2017c5f7c5bc29294b753588b0bea (diff)
downloadgit-ea88ee46de82bf1e398d0cfef05e3dcdf48b1b88.zip
git-ea88ee46de82bf1e398d0cfef05e3dcdf48b1b88.tar.gz
git-ea88ee46de82bf1e398d0cfef05e3dcdf48b1b88.tar.bz2
[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.
Diffstat (limited to 'git-resolve-script')
-rw-r--r--git-resolve-script4
1 files changed, 2 insertions, 2 deletions
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