Subject: [PATCH] merge-ort: fix missing early return

From: "Elijah Newren via GitGitGadget" <[email-masked]>
Date: Thu, 04 Jul 2024 20:02:21 +0000

From: Elijah Newren <[email-masked]>

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 <[email-masked]>
---
    merge-ort: fix missing early return
    
    This is a patch on top of en/ort-inner-merge-error-fix which is in next.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1758%2Fnewren%2Ffix-fix-error-cases-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1758/newren/fix-fix-error-cases-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1758

 merge-ort.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/merge-ort.c b/merge-ort.c
index 8dfe80f1009..d9ba6e3e523 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;

base-commit: f19b9165351a4058832bb43560178474c7501925
-- 
gitgitgadget