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

diff --git a/git-pull-script b/git-pull-script
index b04a9be21b9f57ba4b10501414dbd5ecc892d96b..407488ae9437e90299d6c4b0083cd05342d6c4f9 100755 (executable)
--- 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
        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
        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
 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