diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-03-13 03:16:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-14 12:46:29 +0900 |
| commit | 8b637cdab0cb07dbd45d0f0155685455f46981ea (patch) | |
| tree | a24cf5d9e4140e4fa26d0b0cda75a3a234b853fb | |
| parent | 26527ed86ec373b1063016a4df46d90a36f9c089 (diff) | |
| download | git-8b637cdab0cb07dbd45d0f0155685455f46981ea.tar.gz | |
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>
| -rw-r--r-- | sequencer.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |