From 455b158ff8ae93d0ac51d17bd90e93adf61dedda Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Thu, 4 Jul 2024 09:17:04 -0700 Subject: [PATCH] merge-ort: fix missing early return One of the conversions in 500433edf49 ("merge-ort: convert more error() cases to path_msg()", 2024-06-10) accidentally lost the early return. Restore it. Signed-off-by: Elijah Newren --- merge-ort.c | 1 + 1 file changed, 1 insertion(+) diff --git a/merge-ort.c b/merge-ort.c index 8dfe80f100914f..d9ba6e3e523489 100644 --- 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;