diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-18 23:25:42 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-18 23:25:42 +0300 |
| commit | 7906b5c957b239c4332efb8eb183673cdf952f2f (patch) | |
| tree | e0a65cad03c8fb4a82ba54bcb21ee7973ecb4209 /merge-ort.c | |
| parent | cc7d7183f0a95ef5d7853106515db8b7c495997d (diff) | |
| parent | e95bafc52f095b33b5a283179e08a44279c293d0 (diff) | |
Merge branch 'jc/merge-ort-attr-index-fix'
Fix "git merge-tree" to stop segfaulting when the --attr-source
option is used.
* jc/merge-ort-attr-index-fix:
merge-ort: initialize repo in index state
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-ort.c b/merge-ort.c index 7857ce9fbd..3653725661 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -1902,6 +1902,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) |