diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-18 15:01:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-18 15:01:48 -0700 |
| commit | 00829b5def72f36269796727c9589316a214dc85 (patch) | |
| tree | 55256581c61fa13142e42317364f56f70e7156f6 /git-pull-script | |
| parent | e3b4be7f6c31d85b5f6abc42bd24d61bce5027b4 (diff) | |
| download | git-00829b5def72f36269796727c9589316a214dc85.tar.gz git-00829b5def72f36269796727c9589316a214dc85.tar.xz | |
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
Diffstat (limited to 'git-pull-script')
| -rwxr-xr-x | git-pull-script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-pull-script b/git-pull-script index b04a9be21..407488ae9 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 |