Merge branch 'ah/sequencer-rewrite-todo-fix'

[thirdparty/git.git] / sequencer.c

diff --git a/sequencer.c b/sequencer.c
index cc9821ece2c752b30ba07133cefc1c08c6d1e6d6..adc9cfb4df39f2af7ec00e1c256fcc345f8ade3f 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -2702,7 +2702,7 @@ int todo_list_parse_insn_buffer(struct repository *r, char *buf,
                if (fixup_okay)
                        ; /* do nothing */
                else if (is_fixup(item->command))
-                       return error(_("cannot '%s' without a previous commit"),
+                       res = error(_("cannot '%s' without a previous commit"),
                                command_to_string(item->command));
                else if (!is_noop(item->command))
                        fixup_okay = 1;