diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-05-30 05:16:45 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-05-30 05:16:45 +0300 |
commit | fa0624f79f9d5765d09598b003124b3cf0b9acdb (patch) | |
tree | 838b81830a401c56d3b9409a3fd891b00ef6f8ec /cache.h | |
parent | 35d802d296df4c1f9f058c4dc9c934a872df6bfe (diff) | |
parent | edf3b90553f5c667cd8cb99aa809305470ba3bd7 (diff) |
Merge branch 'dt/unpack-save-untracked-cache-extension'
When "git checkout", "git merge", etc. manipulates the in-core
index, various pieces of information in the index extensions are
discarded from the original state, as it is usually not the case
that they are kept up-to-date and in-sync with the operation on the
main index. The untracked cache extension is copied across these
operations now, which would speed up "git status" (as long as the
cache is properly invalidated).
* dt/unpack-save-untracked-cache-extension:
unpack-trees: preserve index extensions
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -597,6 +597,7 @@ extern int read_index_unmerged(struct index_state *); #define CLOSE_LOCK (1 << 1) extern int write_locked_index(struct index_state *, struct lock_file *lock, unsigned flags); extern int discard_index(struct index_state *); +extern void move_index_extensions(struct index_state *dst, struct index_state *src); extern int unmerged_index(const struct index_state *); extern int verify_path(const char *path); extern int strcmp_offset(const char *s1, const char *s2, size_t *first_change); |