diff options
| author | Jeff King <peff@peff.net> | 2012-11-09 12:51:06 -0500 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-11-09 12:51:06 -0500 |
| commit | 19fb61369583410a4f79dbc065b4dc8125236c0b (patch) | |
| tree | 7f7498d204f8df97ddc0cd6726154a0ce5fa5bb7 /sequencer.c | |
| parent | 9d91c0e3d5d1bf9339a31ecbd5f6defdac8540d0 (diff) | |
| parent | 745f7a8cacae55df3e00507344d8db2a31eb57e8 (diff) | |
| download | git-19fb61369583410a4f79dbc065b4dc8125236c0b.tar.gz git-19fb61369583410a4f79dbc065b4dc8125236c0b.tar.xz | |
Merge branch 'nd/builtin-to-libgit'
Code cleanups so that libgit.a does not depend on anything in the
builtin/ directory.
* nd/builtin-to-libgit:
fetch-pack: move core code to libgit.a
fetch-pack: remove global (static) configuration variable "args"
send-pack: move core code to libgit.a
Move setup_diff_pager to libgit.a
Move print_commit_list to libgit.a
Move estimate_bisect_steps to libgit.a
Move try_merge_command and checkout_fast_forward to libgit.a
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 e3723d209..be0cb8b10 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"); |