Ramkumar Ramachandra <artagnon@xxxxxxxxx> writes:
> diff --git a/builtin/revert.c b/builtin/revert.c
> index f9f5e3a..3936516 100644
> --- a/builtin/revert.c
> +++ b/builtin/revert.c
> @@ -990,8 +990,18 @@ static int pick_commits(struct commit_list *todo_list, struct replay_opts *opts)
> for (cur = todo_list; cur; cur = cur->next) {
> save_todo(cur, opts);
> res = do_pick_commit(cur->item, opts);
> - if (res)
> + if (res) {
> + if (!cur->next)
> + /*
> + * An error was encountered while
> + * picking the last commit; the
> + * sequencer state is useless now --
> + * the user simply needs to resolve
> + * the conflict and commit
> + */
> + remove_sequencer_state();
> return res;
> + }
> }
It may be useless for --continue, but wouldn't --abort need some clue on
what you were doing?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html