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

Re: git-subtree: bug, and ideas for doc improvements

From
YDYann Dirson <dirson@bertin.fr>
Date
Sep 13, 2010, 12:51 UTC
Message-ID
<20100913145118.20469cda@chalon.bertin.fr>
In-Reply-To
<20100913135705.36f8217b@chalon.bertin.fr>

Well, things finally seem even more complicated: in my case, the tree is a bit more particular than what I originally thought:

* I finally understand I read the --onto description wrong.  It could
  surely be made easier to understand, by telling the user he first
  has to import the subproject history into the superproject repo
  first.  Adding an example of this would be of great use too.
* In my case the directory in which the kernel was originally located
  has since then been renamed, and git-subtree stops exploring the
  history at the rename commit, assuming the full import occured there.
  Maybe git-subtree can be taught to follow renames, but currently the
  way to handle that would seem to split in 2 steps:
  - checkout the revision before the move
  - split that part of history using the old name (without
    --rejoin, and with a different --branch name than intended in
    the end)
  - checkout the head to be split
  - split the remaining part, passing --onto the branch name that was
    passed to --branch in the first run
  However, if I try that, the root of the second split has no parent.
  I can use a graft and filter-branch - but there is either something
  else I did not understood incorrectly, or maybe a bug somewhere ?
Best regards,
-- 
Yann Dirson - Bertin Technologies
Previous: Yann Dirson
Message 2 of 2 in “git-subtree: bug, and ideas for doc improvements”
  1. Yann DirsonSep 13, 2010
  2. Yann DirsonSep 13, 2010

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.