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

Add "update-cache --refresh" to git-pull-script to make sure

Browse Source 
out index is all ready to go after a pull.

Noted by Russell King
This commit is contained in:
Linus Torvalds 2005-04-18 15:01:48 -07:00
parent e3b4be7f6c
commit 00829b5def
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

@ -33,7 +33,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
read-tree $merge_tree && checkout-cache -f -a && update-cache --refresh
echo $merge_head > .git/HEAD
exit 0
fi
@ -43,4 +43,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
read-tree $result_tree && checkout-cache -f -a && update-cache --refresh