Skip to content

Commit f1a0db2

Browse files
committed
Merge branch 'tk/untracked-cache-with-uall'
Fix for a bug that makes write-tree to fail to write out a non-existent index as a tree, introduced in 2.37. * tk/untracked-cache-with-uall: read-cache: make `do_read_index()` always set up `istate->repo`
2 parents 0f60955 + 4447d41 commit f1a0db2

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

read-cache.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2294,6 +2294,8 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
22942294
fd = open(path, O_RDONLY);
22952295
if (fd < 0) {
22962296
if (!must_exist && errno == ENOENT) {
2297+
if (!istate->repo)
2298+
istate->repo = the_repository;
22972299
set_new_index_sparsity(istate);
22982300
return 0;
22992301
}

t/t7063-status-untracked-cache.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -986,4 +986,9 @@ test_expect_success '"status" after file replacement should be clean with UC=fal
986986
status_is_clean
987987
'
988988

989+
test_expect_success 'empty repo (no index) and core.untrackedCache' '
990+
git init emptyrepo &&
991+
git -C emptyrepo -c core.untrackedCache=true write-tree
992+
'
993+
989994
test_done

0 commit comments

Comments
 (0)