X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=ll-merge.c;h=6ce512efc4cce8042481e8a6947d033c272e78e6;hb=20fc73e3b0bb2b115d88e54514db13ffaf11b025;hp=007dd3e4d38ff657a29a06e559173b796f193763;hpb=c835288be4cac722a20f9601a920879206a0ff61;p=git.git

diff --git a/ll-merge.c b/ll-merge.c
index 007dd3e4d..6ce512efc 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -351,16 +351,13 @@ int ll_merge(mmbuffer_t *result_buf,
 	     const struct ll_merge_options *opts)
 {
 	static struct git_attr_check check[2];
+	static const struct ll_merge_options default_opts;
 	const char *ll_driver_name = NULL;
 	int marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
 	const struct ll_merge_driver *driver;
 
-	if (!opts) {
-		struct ll_merge_options default_opts = {0};
-		return ll_merge(result_buf, path, ancestor, ancestor_label,
-				ours, our_label, theirs, their_label,
-				&default_opts);
-	}
+	if (!opts)
+		opts = &default_opts;
 
 	if (opts->renormalize) {
 		normalize_file(ancestor, path);