Merge branch 'mc/git-p4-prepare-p4-only'

diff --git a/sequencer.c b/sequencer.c
index 0a80c58d1194c3476dfd2861a98fbd08610597a3..923047459bd3079da74245f2a0185ec437c9e8cd 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -278,7 +278,7 @@ static int fast_forward_to(const unsigned char *to, const unsigned char *from,
 
        read_cache();
        if (checkout_fast_forward(from, to, 1))
-               exit(1); /* the callee should have complained already */
+               exit(128); /* the callee should have complained already */
        ref_lock = lock_any_ref_for_update("HEAD", unborn ? null_sha1 : from,
                                           0, NULL);
        if (!ref_lock)