From: Johannes Schindelin Date: Fri, 14 Oct 2016 13:18:31 GMT Subject: [PATCH v4 18/25] sequencer: do not try to commit when there were merge conflicts Message-ID: <38d5f853444f80c90713f7a6e4ef1f2382549b29.1476450940.git.johannes.schindelin@gmx.de> In-Reply-To: The return value of do_recursive_merge() may be positive (indicating merge conflicts), or 0 (indicating success). It also may be negative, indicating a fatal error that requires us to abort. Now, if the return value indicates that there are merge conflicts, we should not try to commit those changes, of course. Signed-off-by: Johannes Schindelin --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index cbc3742..9ffc090 100644 --- a/sequencer.c +++ b/sequencer.c @@ -787,7 +787,7 @@ static int do_pick_commit(enum todo_command command, struct commit *commit, res = allow; goto leave; } - if (!opts->no_commit) + if (!res && !opts->no_commit) res = run_git_commit(opts->edit ? NULL : git_path_merge_msg(), opts, allow, opts->edit, 0, 0); -- 2.10.1.513.g00ef6dd