Re: [PATCH v2] merge-tree: fix segmentation fault in read-only repositories

Elijah Newren [off-list ref] writes:

quoted

@@ -473,7 +475,7 @@ static int real_merge(struct merge_tree_options *o,
                                              &result);
        }
        merge_finalize(&opt, &result);
-       return !result.clean; /* result.clean < 0 handled above */
+       return !result.tree || !result.clean; /* result.clean < 0 handled above */

Thinking out loud, should this logic be at the merge-ort.c level,

True.

...  However, I do think
merge-ort should be returning a negative value for the "clean" status
in such a case.

True, too.