From 00829b5def72f36269796727c9589316a214dc85 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 18 Apr 2005 15:01:48 -0700 Subject: [PATCH] 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 --- git-pull-script | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-pull-script b/git-pull-script index b04a9be2..407488ae 100755 --- a/git-pull-script +++ b/git-pull-script @@ -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 -- 2.11.0