diff options
| author | Elijah Newren <newren@gmail.com> | 2024-07-04 20:02:21 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-07-06 10:47:00 -0700 |
| commit | fcf59ac1363493c4aab6de8547a28a8dd148871e (patch) | |
| tree | c86fdab84a91110065cfbd67661980cd0066731e /merge-ort.c | |
| parent | f19b9165351a4058832bb43560178474c7501925 (diff) | |
| download | git-fcf59ac1363493c4aab6de8547a28a8dd148871e.tar.gz | |
merge-ort: fix missing early return
One of the conversions in f19b9165 (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>
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-ort.c b/merge-ort.c index 8dfe80f100..d9ba6e3e52 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; |