From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 13 Mar 2019 10:16:32 +0000 (-0700)
Subject: sequencer: improve error message when an OID could not be parsed
X-Git-Tag: v2.22.0-rc0~111^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b637cdab0cb07dbd45d0f0155685455f46981ea;p=git

sequencer: improve error message when an OID could not be parsed

The interactive rebase simply complains about an "invalid line" when the
object hash of, say, a `pick` line could not be parsed.

Let's tell the user what happened in a little more detail.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/sequencer.c b/sequencer.c
index 95dda23eee..f91062718d 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -2137,7 +2137,8 @@ static int parse_insn_line(struct repository *r, struct todo_item *item,
 	item->arg_len = (int)(eol - item->arg);
 
 	if (status < 0)
-		return -1;
+		return error(_("could not parse '%.*s'"),
+			     (int)(end_of_object_name - bol), bol);
 
 	item->commit = lookup_commit_reference(r, &commit_oid);
 	return !item->commit;