diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-11 04:52:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-11 04:52:34 (GMT) |
| commit | 4f049a16bf47c97639cb78b3ede3c6888fe91987 (patch) | |
| tree | 21adbf5990c31e433a30e0f09c89a4da8e78a992 | |
| parent | 340a6120e5efdc37edc2a2dbc7ddc6befd5e6995 (diff) | |
| parent | 4447d4129d944eb136fd5c35014cc2b370a2d752 (diff) | |
| download | git-4f049a16bf47c97639cb78b3ede3c6888fe91987.zip git-4f049a16bf47c97639cb78b3ede3c6888fe91987.tar.gz git-4f049a16bf47c97639cb78b3ede3c6888fe91987.tar.bz2 | |
Merge branch 'tk/untracked-cache-with-uall' into maint
Fix for a bug that makes write-tree to fail to write out a
non-existent index as a tree, introduced in 2.37.
source: <20220722212232.833188-1-martin.agren@gmail.com>
* tk/untracked-cache-with-uall:
read-cache: make `do_read_index()` always set up `istate->repo`
| -rw-r--r-- | read-cache.c | 2 | ||||
| -rwxr-xr-x | t/t7063-status-untracked-cache.sh | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c index 76f372f..4de2077 100644 --- a/read-cache.c +++ b/read-cache.c @@ -2294,6 +2294,8 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist) fd = open(path, O_RDONLY); if (fd < 0) { if (!must_exist && errno == ENOENT) { + if (!istate->repo) + istate->repo = the_repository; set_new_index_sparsity(istate); return 0; } diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh index 9936cc3..c1f0d95 100755 --- a/t/t7063-status-untracked-cache.sh +++ b/t/t7063-status-untracked-cache.sh @@ -985,4 +985,9 @@ test_expect_success '"status" after file replacement should be clean with UC=fal status_is_clean ' +test_expect_success 'empty repo (no index) and core.untrackedCache' ' + git init emptyrepo && + git -C emptyrepo -c core.untrackedCache=true write-tree +' + test_done |