From e95bafc52f095b33b5a283179e08a44279c293d0 Mon Sep 17 00:00:00 2001 From: John Cai Date: Mon, 9 Oct 2023 13:21:00 +0000 Subject: merge-ort: initialize repo in index state initialize_attr_index() does not initialize the repo member of attr_index. Starting in 44451a2e5e (attr: teach "--attr-source=" global option to "git", 2023-05-06), this became a problem because istate->repo gets passed down the call chain starting in git_check_attr(). This gets passed all the way down to replace_refs_enabled(), which segfaults when accessing r->gitdir. Fix this by initializing the repository in the index state. Signed-off-by: John Cai Helped-by: Christian Couder Signed-off-by: Junio C Hamano --- merge-ort.c | 1 + 1 file changed, 1 insertion(+) (limited to 'merge-ort.c') diff --git a/merge-ort.c b/merge-ort.c index a50b095c47..44782c19cb 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -1916,6 +1916,7 @@ static void initialize_attr_index(struct merge_options *opt) struct index_state *attr_index = &opt->priv->attr_index; struct cache_entry *ce; + attr_index->repo = opt->repo; attr_index->initialized = 1; if (!opt->renormalize) -- cgit v1.2.3