merge-ort: fix missing early return

One of the conversions in 500433e ("merge-ort: convert more error() cases to path_msg()", 2024-06-10) accidentally lost the early return. Restore it. Signed-off-by: Elijah Newren <[email protected]>
newren · Jul 4, 2024 · 455b158 · 455b158
1 parent f19b916
commit 455b158
Showing 1 changed file with 1 addition and 0 deletions.
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;