Ramkumar Ramachandra <artagnon@xxxxxxxxx> writes: >>> + 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? > ... > Conclusion: Making "git commit" remove the sequencer state is WRONG. Why not choose to not to clean it at all? Then "rebase --continue" and its equivalent to cherry-pick, rebase and any sequence command) can (and have to anyway) notice that there is nothing more to do, remove the state directory and state "there is nothing more to do". You could make it even easier to use for people by tweaking "a sequence state directory for an operation you earlier started still exists" logic to see if everything is done, but I would say that is icing on the cake. -- 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