summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-08-03 20:36:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-08-03 20:36:07 (GMT)
commitf1a0db23ad269d46ae43fd34d04ab6065081a92f (patch)
tree09bf24edbd920f6120f6b890c61a5381f961a6ad
parent0f609558fc537a3e87f16e6c43eb538056878833 (diff)
parent4447d4129d944eb136fd5c35014cc2b370a2d752 (diff)
downloadgit-f1a0db23ad269d46ae43fd34d04ab6065081a92f.zip
git-f1a0db23ad269d46ae43fd34d04ab6065081a92f.tar.gz
git-f1a0db23ad269d46ae43fd34d04ab6065081a92f.tar.bz2
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`
-rw-r--r--read-cache.c2
-rwxr-xr-xt/t7063-status-untracked-cache.sh5
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 f5050b7..8929ef4 100755
--- a/t/t7063-status-untracked-cache.sh
+++ b/t/t7063-status-untracked-cache.sh
@@ -986,4 +986,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