summaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-25 12:21:45 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-25 12:21:45 -0700
commit9ce7100b1c1aa3a1523057c904f081abcf87ed60 (patch)
tree6b8c27d54489e5bed75ed415ba6f32b7a05cfe86 /sequencer.c
parent786a89d3477c339676ed36d5d2d7507251344952 (diff)
parent43dee070eb8faa400f24a9fee08e64d2d18224c2 (diff)
downloadgit-9ce7100b1c1aa3a1523057c904f081abcf87ed60.tar.gz
Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff'
* fr/sequencer-fail-with-not-one-upon-no-ff: sequencer: signal failed ff as an aborted, not a conflicted merge
Diffstat (limited to 'sequencer.c')
-rw-r--r--sequencer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c
index 0a80c58d11..923047459b 100644
--- 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)