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

Re: How does git store branchpoints?

From
davetron5000 <davetron5000@gmail.com>
Date
Jun 9, 2008, 19:54 UTC
Message-ID
<fd42f577-60ba-4d26-85a3-7ca4ea8295db@a1g2000hsb.googlegroups.com>
In-Reply-To
<m3hcc2wso1.fsf@localhost.localdomain>
>
> You can ask git to find branch point using "git merge-base trunk FOO",
> which should return 'c' (actually, sha-1 of this commit).

OK, this revealed interesting results. The commit it gave me was a commit right before ANOTHER SVN branch that I was originally to work on, but never did. The files git-merge showed conflicts for were files modified since THAT branch (call it BAR) was created and before my branch (FOO) was created.

So, any ideas why git thinks that my two branches are rooted at BAR and not FOO? git-svn dcommit on local-FOO commits to FOO and not BAR.

Dave
Previous: Jakub NarebskiNext: Jakub Narebski
Message 3 of 5 in “How does git store branchpoints?”
  1. davetron5000Jun 9, 2008
  2. Jakub NarebskiJun 9, 2008
  3. davetron5000Jun 9, 2008
  4. Jakub NarebskiJun 9, 2008
  5. David CopelandJun 9, 2008

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.