sequencer: lib'ify fast_forward_to()
Instead of dying there, let the caller high up in the callchain notice the error and handle it (by dying, still). The only caller of fast_forward_to(), do_pick_commit() already checks the return value and passes it on to its callers, so its caller must be already prepared to handle error returns, and with this step, we make it notice an error return from this function. So this is a safe conversion to make fast_forward_to() callable from new callers that want it not to die, without changing the external behaviour of anything existing. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Sep 9, 2016 at 16:37 UTC
0e408fc347088aa54f97cada3b880afd2560cc94
1 file changed
+1
-1
sequencer.c
+1
-1
@@ -226,7 +226,7 @@ static int fast_forward_to(const unsigned char *to, const unsigned char *from,
226
227
read_cache();
228
if (checkout_fast_forward(from, to, 1))
229
- exit(128); /* the callee should have complained already */
229
+ return -1; /* the callee should have complained already */
230
231
strbuf_addf(&sb, _("%s: fast-forward"), action_name(opts));
232