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

Re: Regression in git-subtree.sh, introduced in 2.20.1, after 315a84f9aa0e2e629b0680068646b0032518ebed

From
TCTom Clarkson <tom@orangeguava.com>
Date
Mar 12, 2020, 10:43 UTC
Message-ID
<65C25466-895B-4EEE-87BF-C8823AB953FE@icloud.com>
In-Reply-To
<3E84DE22-9614-4E1B-9717-69F6777DD219@msys.ch>
Deleting the subtree-cache directory should be safe enough, it only holds a record of previously created commit mappings, and deleting it just makes subsequent runs slower.
The data that actually determines whether you have a regular merge or a subtree merge is part of the commit message, and everything else is derived from that.
Show 12 quoted lines
> On 12 Mar 2020, at 9:33 pm, Marc Balmer <marc@msys.ch> wrote:
> 
> G'day
> 
> Due to some issue in git subtree, a subtree push pushed all commits (over 8000) ever done to the main repository.  So the history of the subtree'ed repository not only showed commits done to the particular subtree, but all commits in the whole project (see E-mail exchange below).
> 
> Today we decided to no longer use subtrees, but to use two independend repository and managing merges manually.
> 
> How can we get rid of a subtree cache data?  Is it enough to remove the .git/subtree-cache directory?  Or is that dangerous?  Does git-subtree store any data anywhere else?
> 
> Thanks and regards,
> Marc
Message 1 of 1 in “Re: Regression in git-subtree.sh, introduced in 2.20.1, after 315a84f9aa0e2e629b0680068646b0032518ebed”
  1. Tom ClarksonMar 12, 2020

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.