Skip to content

Commit edfb63d

Browse files
committed
sequencer: DO NOT DIE
A fast-forward may fail e.g. when it would overwrite an untracked file. We still must not exit() in that case: the sequencer is supposedly providing a library function. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 694a981 commit edfb63d

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
@@ -339,7 +339,7 @@ static int fast_forward_to(const unsigned char *to, const unsigned char *from,
339339

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

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

0 commit comments

Comments
 (0)