Merge branch 'jc/merge-ort-attr-index-fix'

[thirdparty/git.git] / merge-ort.c

diff --git a/merge-ort.c b/merge-ort.c
index 7857ce9fbd18e5575ae998c710a8b6c4e5f67427..36537256613b5d18aff7b4b0d6e45ca7b921d146 100644 (file)
--- 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)