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

Re: [PATCH] git-svn: always use --first-parent

From
EWEric Wong <normalperson@yhbt.net>
Date
Sep 7, 2007, 00:37 UTC
Message-ID
<20070907003745.GA24713@hand.yhbt.net>
In-Reply-To
<11891232082570-git-send-email-hjemli@gmail.com>
Lars Hjemli <hjemli@gmail.com> wrote:
Show 14 quoted lines
> This makes git-svn unconditionally invoke git-log with --first-parent when
> it is trying to discover its upstream subversion branch and collecting the
> commit ids which should be pushed to it with dcommit. The reason for always
> using --first-parent is to make git-svn behave in a predictable way when the
> ancestry chain contains merges with other git-svn branches.
> 
> Since git-svn now always uses 'git-log --first-parent' there is no longer
> any need for the --first-parent option to git-svn, so this is removed.
> 
> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
> ---
> 
> I'd like to add a '--upstream <revspec>' option, just for completeness, but
> that will also require a new test script and now it's way past my bedtime.

Sure thing. We can work on getting --upstream another time, but for now this is probably the best way to allow merges to work with git-svn.

Acked-by: Eric Wong <normalperson@yhbt.net>
-- 
Eric Wong
Previous: Lars Hjemli
Message 2 of 2 in “git-svn: always use --first-parent”
  1. git-svn: always use --first-parentLars Hjemli, Sep 7, 2007
  2. Eric WongSep 7, 2007

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.