diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-30 11:16:45 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-30 11:16:45 +0900 |
| commit | fa0624f79f9d5765d09598b003124b3cf0b9acdb (patch) | |
| tree | 838b81830a401c56d3b9409a3fd891b00ef6f8ec | |
| parent | 35d802d296df4c1f9f058c4dc9c934a872df6bfe (diff) | |
| parent | edf3b90553f5c667cd8cb99aa809305470ba3bd7 (diff) | |
| download | git-fa0624f79f9d5765d09598b003124b3cf0b9acdb.tar.gz | |
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
| -rw-r--r-- | cache.h | 1 | ||||
| -rw-r--r-- | read-cache.c | 6 | ||||
| -rwxr-xr-x | t/t7063-status-untracked-cache.sh | 22 | ||||
| -rw-r--r-- | unpack-trees.c | 1 |
4 files changed, 30 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); diff --git a/read-cache.c b/read-cache.c index 22ab8b5b61..92eb15c000 100644 --- a/read-cache.c +++ b/read-cache.c @@ -2625,3 +2625,9 @@ void stat_validity_update(struct stat_validity *sv, int fd) fill_stat_data(sv->sd, &st); } } + +void move_index_extensions(struct index_state *dst, struct index_state *src) +{ + dst->untracked = src->untracked; + src->untracked = NULL; +} diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh index 0667bd9dd3..e5fb892f95 100755 --- a/t/t7063-status-untracked-cache.sh +++ b/t/t7063-status-untracked-cache.sh @@ -661,4 +661,26 @@ test_expect_success 'test ident field is working' ' test_i18ncmp ../expect ../err ' +test_expect_success 'untracked cache survives a checkout' ' + git commit --allow-empty -m empty && + test-dump-untracked-cache >../before && + test_when_finished "git checkout master" && + git checkout -b other_branch && + test-dump-untracked-cache >../after && + test_cmp ../before ../after && + test_commit test && + test-dump-untracked-cache >../before && + git checkout master && + test-dump-untracked-cache >../after && + test_cmp ../before ../after +' + +test_expect_success 'untracked cache survives a commit' ' + test-dump-untracked-cache >../before && + git add done/two && + git commit -m commit && + test-dump-untracked-cache >../after && + test_cmp ../before ../after +' + test_done diff --git a/unpack-trees.c b/unpack-trees.c index c312c2cd3a..d38c37e38c 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1396,6 +1396,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options WRITE_TREE_SILENT | WRITE_TREE_REPAIR); } + move_index_extensions(&o->result, o->dst_index); discard_index(o->dst_index); *o->dst_index = o->result; } else { |