diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-01-02 16:35:42 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:06:01 -0800 |
| commit | 27fdbb96aae789105dadbddbfa9bccce8f88d3c8 (patch) | |
| tree | 86f9b44c7810bbf1733c7920ba4b158f85d733dc /sequencer.c | |
| parent | sequencer (rebase -i): show only failed cherry-picks' output (diff) | |
| download | tgif-27fdbb96aae789105dadbddbfa9bccce8f88d3c8.tar.xz | |
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>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 6 |
1 files changed, 5 insertions, 1 deletions
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()))) |