summaryrefslogtreecommitdiff
path: root/mergetools/emerge
diff options
context:
space:
mode:
authorMartin Ågren <martin.agren@gmail.com>2022-07-22 21:22:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-07-22 21:51:00 (GMT)
commit4447d4129d944eb136fd5c35014cc2b370a2d752 (patch)
tree69dce76dac38dbd628f1daf395037242c317d145 /mergetools/emerge
parente6a653554bb49c26d105f3b478cbdbb1c0648f65 (diff)
downloadgit-4447d4129d944eb136fd5c35014cc2b370a2d752.zip
git-4447d4129d944eb136fd5c35014cc2b370a2d752.tar.gz
git-4447d4129d944eb136fd5c35014cc2b370a2d752.tar.bz2
read-cache: make `do_read_index()` always set up `istate->repo`
If there is no index file, e.g., because the repository has just been created, we return zero early (unless `must_exist` makes us die instead.) This early return means we do not set up `istate->repo`. With `core.untrackedCache=true`, the recent e6a653554b ("untracked-cache: support '--untracked-files=all' if configured", 2022-03-31) will eventually pass down `istate->repo` as a null pointer to `repo_config_get_string()`, causing a segmentation fault. If we do hit this early return, set up `istate->repo` similar to when we actually read the index. Reported-by: Joey Hess <id@joeyh.name> Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/emerge')
0 files changed, 0 insertions, 0 deletions