sequencer (rebase -i): leave a patch upon error

dscho · dscho · commit 2748862e9dae · 2016-04-19T12:33:38.000+02:00
Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/sequencer.c b/sequencer.c
@@ -797,7 +797,6 @@ static int update_squash_messages(enum todo_command command,
 	return 0;
 }
 
-
 static int do_pick_commit(enum todo_command command, struct commit *commit,
 		struct replay_opts *opts, int final_fixup)
 {
@@ -1583,6 +1582,8 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
 			if (res && is_fixup(item->command))
 				return error_failed_squash(item->commit, opts,
 					item->arg_len, item->arg);
+			else if (res && IS_REBASE_I())
+				return res | make_patch(item->commit, opts);
 		}
 		else if (item->command == TODO_EXEC) {
 			char *end_of_arg = (char *)(item->arg + item->arg_len);

Original file line number	Diff line number	Diff line change
`@@ -797,7 +797,6 @@ static int update_squash_messages(enum todo_command command,`
`797`	`797`	`return 0;`
`798`	`798`	`}`
`799`	`799`
`800`		`-`
`801`	`800`	`static int do_pick_commit(enum todo_command command, struct commit *commit,`
`802`	`801`	`struct replay_opts *opts, int final_fixup)`
`803`	`802`	`{`
`@@ -1583,6 +1582,8 @@ static int pick_commits(struct todo_list todo_list, struct replay_opts opts)`
`1583`	`1582`	`if (res && is_fixup(item->command))`
`1584`	`1583`	`return error_failed_squash(item->commit, opts,`
`1585`	`1584`	`item->arg_len, item->arg);`
	`1585`	`+ else if (res && IS_REBASE_I())`
	`1586`	`+ return res \| make_patch(item->commit, opts);`
`1586`	`1587`	`}`
`1587`	`1588`	`else if (item->command == TODO_EXEC) {`
`1588`	`1589`	`char end_of_arg = (char )(item->arg + item->arg_len);`