From: Jeff King <peff@peff.net>
Date: Thu, 25 Oct 2012 09:45:01 GMT
Subject: Re: [PATCH] Move try_merge_command and checkout_fast_forward to libgit.a
Message-ID: <20121025094500.GJ8390@sigill.intra.peff.net>
In-Reply-To: <1350959091-30030-1-git-send-email-pclouds@gmail.com>

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 <pclouds@gmail.com>
> ---
>  I made some unrelated changes in sequencer.c and this problem shown
>  up. merge-recursive.c is probably not the best place for these
>  functions. I just don't want to create merge.c for them.

I'm fine with this conceptually, but merge-recursive really is the wrong
place. I'd much rather see a new merge.c to collect merge-related helper
functions that are not strategy-specific.

-Peff