development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 02:57:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Update "git-pull-script" to use "read-tree -m" for

Browse source 
reading a single tree too. That should speed up a
trivial merge noticeably.

Also, don't bother reading back the tree we just wrote
when we committed a real merge. It had better be the
same one we still have..
This commit is contained in:
Linus Torvalds 2005-04-19 12:56:47 -07:00
parent a3a65234db
commit 8ccfbf3279
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-pull-script
View file

@ -35,7 +35,7 @@ if [ "$common" == "$head" ]; then
echo "Destroying all noncommitted data!"
echo "Kill me within 3 seconds.."
sleep 3
read-tree $merge_tree && checkout-cache -f -a && update-cache --refresh
read-tree -m $merge_tree && checkout-cache -f -a && update-cache --refresh
echo $merge_head > .git/HEAD
exit 0
fi
@ -45,4 +45,4 @@ result_tree=$(write-tree) || exit 1
result_commit=$(echo "Merge $merge_repo" | commit-tree $result_tree -p $head -p $merge_head)
echo "Committed merge $result_commit"
echo $result_commit > .git/HEAD
read-tree $result_tree && checkout-cache -f -a && update-cache --refresh
checkout-cache -f -a && update-cache --refresh