Skip to content

Commit 0e408fc

Browse files
dschogitster
authored andcommitted
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>
1 parent 88d5a27 commit 0e408fc

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

sequencer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ static int fast_forward_to(const unsigned char *to, const unsigned char *from,
226226

227227
read_cache();
228228
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 */
230230

231231
strbuf_addf(&sb, _("%s: fast-forward"), action_name(opts));
232232

0 commit comments

Comments
 (0)