merge-ort: fix missing early return

newren · gitster · commit fcf59ac13634 · 2024-07-06T10:47:00.000-07:00
One of the conversions in f19b916 (merge-ort: convert more error() cases to path_msg(), 2024-06-19) accidentally lost the early return. Restore it. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/merge-ort.c b/merge-ort.c
@@ -3618,6 +3618,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
`@@ -3618,6 +3618,7 @@ static int read_oid_strbuf(struct merge_options *opt,`
`3618`	`3618`	`path_msg(opt, ERROR_OBJECT_NOT_A_BLOB, 0,`
`3619`	`3619`	`path, NULL, NULL, NULL,`
`3620`	`3620`	`_("error: object %s is not a blob"), oid_to_hex(oid));`
	`3621`	`+ return -1;`
`3621`	`3622`	`}`
`3622`	`3623`	`strbuf_attach(dst, buf, size, size + 1);`
`3623`	`3624`	`return 0;`