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

Re: git subtree bug produces divergent descendants

From
David Ware <davidw@realtimegenomics.com>
Date
Dec 7, 2015, 21:01 UTC
Message-ID
<CAET=KiXHoasXv6_y=SLZEAd=CCzj0T3zW6Wb7rF42=8v2LxZ+w@mail.gmail.com>
In-Reply-To
<20151207045307.GA624@flurp.local>

Thanks for taking the time to look over it. I'm not familiar with the process here.

On Mon, Dec 7, 2015 at 5:53 PM, Eric Sunshine <sunshine@sunshineco.com> wrote:
Show 17 quoted lines
> Tests don't automatically return to the directory prior to the 'cd',
> so when this test ends, the current directory will still be
> 'git_subtree_split_check'. If someone later adds a test following
> this one, that test will execute within 'git_subtree_split_check',
> which might not be expected by the test writer.
>
> To ensure that the prior working directory is restored at the end of
> the test (regardless of success or failure), tests typically employ a
> subshell using this idiom:
>
>     mkdir foo &&
>     (
>         cd foo &&
>         ... &&
>         ...
>     )
>

I'm not at all familiar with this test harness so I had a few problems here (like this, and the bash variable). Thank you for the advice.

Cheers, Dave Ware

Previous: David A. Greene
Message 22 of 22 in “git subtree bug produces divergent descendants”
  1. David WareDec 6, 2015
  2. Eric SunshineDec 7, 2015
  3. contrib/subtree: fix "subtree split" skipped-merge bug.Dave Ware, Dec 7, 2015
  4. Eric SunshineDec 8, 2015
  5. contrib/subtree: fix "subtree split" skipped-merge bugDave Ware, Dec 8, 2015
  6. Junio C HamanoDec 8, 2015
  7. David WareDec 9, 2015
  8. contrib/subtree: fix "subtree split" skipped-merge bugDave Ware, Dec 9, 2015
  9. Eric SunshineDec 9, 2015
  10. contrib/subtree: fix "subtree split" skipped-merge bugDave Ware, Dec 9, 2015
  11. David A. GreeneJan 13, 2016
  12. David WareJan 13, 2016
  13. David A. GreeneJan 14, 2016
  14. David WareJan 14, 2016
  15. David A. GreeneJan 17, 2016
  16. contrib/subtree: fix "subtree split" skipped-merge bugDave Ware, Jan 14, 2016
  17. contrib/subtree: fix "subtree split" skipped-merge bugDave Ware, Jan 15, 2016
  18. Eric SunshineJan 15, 2016
  19. Junio C HamanoJan 15, 2016
  20. Eric SunshineJan 15, 2016
  21. David A. GreeneJan 17, 2016
  22. David WareDec 7, 2015

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.