update-index: reduce scope of index expansion in do_reupdate
Replace unconditional index expansion in 'do_reupdate()' with one scoped to only where a full index is needed. A full index is only required in 'do_reupdate()' when a sparse directory in the index differs from HEAD; in that case, the index is expanded and the operation restarted. Because the index should only be expanded if a sparse directory is modified, add a test ensuring the index is not expanded when differences only exist within the sparse cone. Signed-off-by: Victoria Dye <vdye@github.com> Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Victoria Dye committed
Jan 11, 2022 at 18:05 UTC
b9ca5e26579ceb820103b49648c01187a4a0dddd
2 files changed
+15
-4
builtin/update-index.c
+11
-3
@@ -606,7 +606,7 @@ static struct cache_entry *read_one_ent(const char *which,
606
error("%s: not in %s branch.", path, which);
607
return NULL;
608
}
609
- if (mode == S_IFDIR) {
609
+ if (!the_index.sparse_index && mode == S_IFDIR) {
610
if (which)
611
error("%s: not a blob in %s branch.", path, which);
612
return NULL;
@@ -743,8 +743,6 @@ static int do_reupdate(int ac, const char **av,
743
*/
744
has_head = 0;
745
redo:
746
- /* TODO: audit for interaction with sparse-index. */
747
- ensure_full_index(&the_index);
746
for (pos = 0; pos < active_nr; pos++) {
747
const struct cache_entry *ce = active_cache[pos];
748
struct cache_entry *old = NULL;
@@ -761,6 +759,16 @@ static int do_reupdate(int ac, const char **av,
759
discard_cache_entry(old);
760
continue; /* unchanged */
761
}
762
+
763
+ /* At this point, we know the contents of the sparse directory are
764
+ * modified with respect to HEAD, so we expand the index and restart
765
+ * to process each path individually
766
+ */
767
+ if (S_ISSPARSEDIR(ce->ce_mode)) {
768
+ ensure_full_index(&the_index);
769
+ goto redo;
770
+ }
771
+
772
/* Be careful. The working tree may not have the
773
* path anymore, in which case, under 'allow_remove',
774
* or worse yet 'allow_replace', active_nr may decrease.
t/t1092-sparse-checkout-compatibility.sh
+4
-1
@@ -1265,7 +1265,10 @@ test_expect_success 'sparse index is not expanded: update-index' '
1265
1266
ensure_not_expanded update-index --add README.md &&
1267
ensure_not_expanded update-index a &&
1268
- ensure_not_expanded update-index --remove deep/a
1268
+ ensure_not_expanded update-index --remove deep/a &&
1269
+
1270
+ ensure_not_expanded reset --soft update-deep &&
1271
+ ensure_not_expanded update-index --add --remove --again
1272
'
1273
1274
test_expect_success 'sparse index is not expanded: blame' '