Skip to content

Commit

Permalink
sequencer: lib'ify fast_forward_to()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
dscho committed Oct 29, 2016
1 parent 5f543ea commit fb7c5a7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sequencer.c
Expand Up @@ -226,7 +226,7 @@ static int fast_forward_to(const unsigned char *to, const unsigned char *from,

read_cache();
if (checkout_fast_forward(from, to, 1))
exit(128); /* the callee should have complained already */
return -1; /* the callee should have complained already */

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

Expand Down

0 comments on commit fb7c5a7

Please sign in to comment.