unpack-trees: preserve index extensions
Make git checkout (and other unpack_tree operations) preserve the untracked cache. This is valuable for two reasons: 1. Often, an unpack_tree operation will not touch large parts of the working tree, and thus most of the untracked cache will continue to be valid. 2. Even if the untracked cache were entirely invalidated by such an operation, the user has signaled their intention to have such a cache, and we don't want to throw it away. [jes: backed out the watchman-specific parts] Signed-off-by: David Turner <dturner@twopensource.com> Signed-off-by: Ben Peart <benpeart@microsoft.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
4fa66c85f1
commit
edf3b90553
1
cache.h
1
cache.h
@ -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);
|
||||
|
@ -2628,3 +2628,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;
|
||||
}
|
||||
|
@ -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
|
||||
|
@ -1391,6 +1391,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 {
|
||||
|
Loading…
Reference in New Issue
Block a user