Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
[PATCH] optimize git-resolve-script
author
Jeff Garzik
<jgarzik@pobox.com>
Wed, 25 May 2005 17:21:09 +0000
(13:21 -0400)
committer
Linus Torvalds
<torvalds@ppc970.osdl.org>
Wed, 25 May 2005 18:59:37 +0000
(11:59 -0700)
This change was suggested for my git-switch-tree script, and the same
issues apply to core git's git-resolve-script as well.
git-resolve-script
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
6f93a63
)
diff --git
a/git-resolve-script
b/git-resolve-script
index ec646fbb915d932cad66d8b4bd7457d844b7dd38..5f1a748cede943a269c6ddf8f38dbcbe0aa8723d 100644
(file)
--- 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
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
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
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
git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1