mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
[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.
This commit is contained in:
parent
6f93a631ac
commit
ea88ee46de
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue