undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] optimize git-resolve-script

Browse Source 
This change was suggested for my git-switch-tree script, and the same
issues apply to core git's git-resolve-script as well.
This commit is contained in:
Jeff Garzik 2005-05-25 13:21:09 -04:00 committed by Linus Torvalds
parent 6f93a631ac
commit ea88ee46de
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-resolve-script
View File

@ -39,7 +39,7 @@ if [ "$common" == "$head" ]; then
echo "Destroying all noncommitted data!" echo "Destroying all noncommitted data!"
echo "Kill me within 3 seconds.." echo "Kill me within 3 seconds.."
sleep 3 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 echo $merge > "$GIT_DIR"/HEAD
git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1 git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1
exit 0 exit 0
@ -57,5 +57,5 @@ fi
result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge) result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
echo "Committed merge $result_commit" echo "Committed merge $result_commit"
echo $result_commit > "$GIT_DIR"/HEAD 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