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
Ed Maste <emaste@freebsd.org>
Date
Dec 9, 2019, 11:45 UTC
Message-ID
<CAPyFy2BjWx2Hp+H__kDFRFZZjcK4hc99oKqkZQjXPLfQE=2SPg@mail.gmail.com>
In-Reply-To
<3b9408a9bd87ea488c4a6b9bc2583aba56ce3949.camel@swri.org>
On Mon, 9 Dec 2019 at 09:29, Strain, Roger L. <roger.strain@swri.org> wrote:
>
> I've had to further
> customize the script for our internal use, and those changes aren't
> something that would be useful for the public at large.

Would you describe the sort of problem you have to work around with custom changes?

I'm starting on a path of trying to fix git-subtree for failures[1] encountered in a prototype conversion of the FreeBSD repository from svn to git. The misbehaviour I encounter occurs when split encounters a commit for which the path being split is empty in 'git ls-tree', and the commit is actually not a subtree commit. I'm currently experimenting with hacks to skip specific hashes during the initial subtree split. On reading your mail I realize I could address my issue by testing for the existence of a specific file though, which makes me wonder if the issue you have is similar.

[1] https://lore.kernel.org/git/CAPyFy2AsmaxU-BDf_teZJE5hiaVpTSZc8fftnuXPb_4-j7j5Fw@mail.gmail.com/
Previous: Tom ClarksonNext: Strain, Roger L.
Message 15 of 20 in “RE: Regression in git-subtree.sh, introduced in 2.20.1, after 315a84f9aa0e2e629b0680068646b0032518ebed”
  1. Nadav SInaiDec 8, 2019
  2. Strain, Roger L.Dec 9, 2019
  3. Marc BalmerDec 9, 2019
  4. Strain, Roger L.Dec 9, 2019
  5. Marc BalmerDec 9, 2019
  6. Johannes SchindelinDec 9, 2019
  7. Marc BalmerDec 9, 2019
  8. Johannes SchindelinDec 9, 2019
  9. Tom ClarksonDec 11, 2019
  10. Strain, Roger L.Dec 11, 2019
  11. Tom ClarksonDec 12, 2019
  12. Johannes SchindelinDec 13, 2019
  13. Marc BalmerDec 14, 2019
  14. Tom ClarksonDec 16, 2019
  15. Ed MasteDec 9, 2019
  16. Strain, Roger L.Dec 9, 2019
  17. Tom ClarksonDec 14, 2019
  18. Ed MasteDec 16, 2019
  19. Tom ClarksonDec 18, 2019
  20. Marc BalmerMar 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.