diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-09-09 14:37:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-09 18:24:52 (GMT) |
| commit | 0e408fc347088aa54f97cada3b880afd2560cc94 (patch) | |
| tree | 441916592468e23db122107953170733063fb5cf /sequencer.c | |
| parent | 88d5a271b01cbbdcfe558a6bf98b601911c33c03 (diff) | |
| download | git-0e408fc347088aa54f97cada3b880afd2560cc94.zip git-0e408fc347088aa54f97cada3b880afd2560cc94.tar.gz git-0e408fc347088aa54f97cada3b880afd2560cc94.tar.bz2 | |
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>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 021ddf3..d92a632 100644 --- a/sequencer.c +++ b/sequencer.c @@ -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)); |