提交 00829b5d 编写于 作者: L Linus Torvalds

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

out index is all ready to go after a pull.

Noted by Russell King
上级 e3b4be7f
...@@ -33,7 +33,7 @@ if [ "$common" == "$head" ]; then ...@@ -33,7 +33,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
read-tree $merge_tree && checkout-cache -f -a read-tree $merge_tree && checkout-cache -f -a && update-cache --refresh
echo $merge_head > .git/HEAD echo $merge_head > .git/HEAD
exit 0 exit 0
fi fi
...@@ -43,4 +43,4 @@ result_tree=$(write-tree) || exit 1 ...@@ -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) result_commit=$(echo "Merge $merge_repo" | commit-tree $result_tree -p $head -p $merge_head)
echo "Committed merge $result_commit" echo "Committed merge $result_commit"
echo $result_commit > .git/HEAD echo $result_commit > .git/HEAD
read-tree $result_tree && checkout-cache -f -a read-tree $result_tree && checkout-cache -f -a && update-cache --refresh
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册