Re: [PATCH] Move try_merge_command and checkout_fast_forward to libgit.a

2012-10-26 Thread Jeff King
On Thu, Oct 25, 2012 at 07:50:26PM +0700, Nguyen Thai Ngoc Duy wrote: > On Thu, Oct 25, 2012 at 4:45 PM, Jeff King wrote: > > On Tue, Oct 23, 2012 at 09:24:51AM +0700, Nguyen Thai Ngoc Duy wrote: > > > >> These functions are called in sequencer.c, which is part of > >> libgit.a. This makes libgit

Re: [PATCH] Move try_merge_command and checkout_fast_forward to libgit.a

2012-10-25 Thread Nguyen Thai Ngoc Duy
On Thu, Oct 25, 2012 at 4:45 PM, Jeff King wrote: > On Tue, Oct 23, 2012 at 09:24:51AM +0700, Nguyen Thai Ngoc Duy wrote: > >> 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

Re: [PATCH] Move try_merge_command and checkout_fast_forward to libgit.a

2012-10-25 Thread Jeff King
On Tue, Oct 23, 2012 at 09:24:51AM +0700, Nguyen Thai Ngoc Duy wrote: > 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 > --- > I made some unrela

[PATCH] Move try_merge_command and checkout_fast_forward to libgit.a

2012-10-22 Thread Nguyễn Thái Ngọc Duy
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 --- I made some unrelated changes in sequencer.c and this problem shown up. merge-recursive.c is probably