git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Jeff King <peff@peff.net>
Date
Oct 25, 2012, 09:45 UTC
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:
Show 9 quoted lines
> 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
Previous: Nguyễn Thái Ngọc DuyNext: Nguyen Thai Ngoc Duy
Message 2 of 13 in “Move try_merge_command and checkout_fast_forward to libgit.a”
  1. Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy, Oct 23, 2012
  2. Jeff KingOct 25, 2012
  3. Nguyen Thai Ngoc DuyOct 25, 2012
  4. Jeff KingOct 26, 2012
  5. 0/7 Move code from builtin to libgit.aNguyễn Thái Ngọc Duy, Oct 26, 2012
  6. 1/7 Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy, Oct 26, 2012
  7. 2/7 Move estimate_bisect_steps to libgit.aNguyễn Thái Ngọc Duy, Oct 26, 2012
  8. 3/7 Move print_commit_list to libgit.aNguyễn Thái Ngọc Duy, Oct 26, 2012
  9. 4/7 Move setup_diff_pager to libgit.aNguyễn Thái Ngọc Duy, Oct 26, 2012
  10. 5/7 send-pack: move core code to libgit.aNguyễn Thái Ngọc Duy, Oct 26, 2012
  11. 6/7 fetch-pack: remove global (static) configuration variable "args"Nguyễn Thái Ngọc Duy, Oct 26, 2012
  12. 7/7 fetch-pack: move core code to libgit.aNguyễn Thái Ngọc Duy, Oct 26, 2012
  13. Jeff KingOct 29, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.