From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 2 Jan 2017 15:35:42 +0000 (+0100)
Subject: sequencer (rebase -i): suggest --edit-todo upon unknown command
X-Git-Tag: v2.12.0-rc0~38^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27fdbb96aae789105dadbddbfa9bccce8f88d3c8;p=thirdparty%2Fgit.git

sequencer (rebase -i): suggest --edit-todo upon unknown command

This is the same behavior as known from `git rebase -i`.

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 27dc91cc95..5784fb487b 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -1314,8 +1314,12 @@ static int read_populate_todo(struct todo_list *todo_list,
 	close(fd);
 
 	res = parse_insn_buffer(todo_list->buf.buf, todo_list);
-	if (res)
+	if (res) {
+		if (is_rebase_i(opts))
+			return error(_("please fix this using "
+				       "'git rebase --edit-todo'."));
 		return error(_("unusable instruction sheet: '%s'"), todo_file);
+	}
 
 	if (!todo_list->nr &&
 	    (!is_rebase_i(opts) || !file_exists(rebase_path_done())))