Merge branch 'en/ort-inner-merge-error-fix' into jch

gitster · gitster · commit 22c02b0a170d · 2024-07-08T14:54:23.000-07:00
The "ort" merge backend saw one bugfix for a crash that happens
when inner merge gets killed, and assorted code clean-ups.

* en/ort-inner-merge-error-fix:
  merge-ort: fix missing early return
diff --git a/merge-ort.c b/merge-ort.c
@@ -3620,6 +3620,7 @@ static int read_oid_strbuf(struct merge_options *opt,
 		path_msg(opt, ERROR_OBJECT_NOT_A_BLOB, 0,
 			 path, NULL, NULL, NULL,
 			 _("error: object %s is not a blob"), oid_to_hex(oid));
+		return -1;
 	}
 	strbuf_attach(dst, buf, size, size + 1);
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -3620,6 +3620,7 @@ static int read_oid_strbuf(struct merge_options *opt,`
`3620`	`3620`	`path_msg(opt, ERROR_OBJECT_NOT_A_BLOB, 0,`
`3621`	`3621`	`path, NULL, NULL, NULL,`
`3622`	`3622`	`_("error: object %s is not a blob"), oid_to_hex(oid));`
	`3623`	`+ return -1;`
`3623`	`3624`	`}`
`3624`	`3625`	`strbuf_attach(dst, buf, size, size + 1);`
`3625`	`3626`	`return 0;`