diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-20 03:58:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-20 04:16:42 -0700 |
| commit | 83ae209bf9708bf1b67dbac4a3629a0003af5dbb (patch) | |
| tree | a5e36c308a6a5121b66f7648e69627a71f6c37f6 /t/t6023-merge-file.sh | |
| parent | read-tree -m A B: prime cache-tree from the switched-to tree (diff) | |
| download | tgif-83ae209bf9708bf1b67dbac4a3629a0003af5dbb.tar.xz | |
checkout branch: prime cache-tree fully
When switching to another branch, the earlier code relied on incremental
invalidation of cache-tree entries to degrade it. While it is not wrong
per-se, we know that the resulting index must fully match the branch we
are switching to unless the -m (merge) option is used.
We should simply fully re-prime the cache-tree using the new tree object
in such a case. And for safety, invalidate the cache-tree as a whole in
other cases.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6023-merge-file.sh')
0 files changed, 0 insertions, 0 deletions