diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-10-26 15:53:49 (GMT) |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-10-29 07:08:30 (GMT) |
| commit | db699a8a1f2c8063620efae41e66786c11a31d8f (patch) | |
| tree | 354121c11f07e75d89757593f2d9aae1909056bf /sequencer.c | |
| parent | 2cfceefaca16d64baecf0ba9bcd4e05229d9c31b (diff) | |
| download | git-db699a8a1f2c8063620efae41e66786c11a31d8f.zip git-db699a8a1f2c8063620efae41e66786c11a31d8f.tar.gz git-db699a8a1f2c8063620efae41e66786c11a31d8f.tar.bz2 | |
Move try_merge_command and checkout_fast_forward to libgit.a
These functions are called in sequencer.c, which is part of
libgit.a. This makes libgit.a potentially require builtin/merge.c for
external git commands.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
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 e3723d2..be0cb8b 100644 --- a/sequencer.c +++ b/sequencer.c @@ -191,7 +191,7 @@ static int fast_forward_to(const unsigned char *to, const unsigned char *from) struct ref_lock *ref_lock; read_cache(); - if (checkout_fast_forward(from, to)) + if (checkout_fast_forward(from, to, 1)) exit(1); /* the callee should have complained already */ ref_lock = lock_any_ref_for_update("HEAD", from, 0); return write_ref_sha1(ref_lock, to, "cherry-pick"); |