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

Re: [PATCH v2 2/2] merge-base: "--reflog" mode finds fork point from reflog entries

From
John Keeping <john@keeping.me.uk>
Date
Oct 25, 2013, 08:09 UTC
Message-ID
<20131025080923.GG10779@serenity.lan>
In-Reply-To
<526A19CA.9020609@viscovery.net>
On Fri, Oct 25, 2013 at 09:12:10AM +0200, Johannes Sixt wrote:
Show 31 quoted lines
> Am 10/25/2013 0:21, schrieb Junio C Hamano:
> > +test_expect_success 'using reflog to find the fork point' '
> > +	git reset --hard &&
> > +	git checkout -b base $E &&
> > +
> > +	for count in 1 2 3 4 5
> > +	do
> > +		git commit --allow-empty -m "Base commit #$count" &&
> > +		git rev-parse HEAD >expect$count &&
> > +		git checkout -B derived &&
> > +		git commit --allow-empty -m "Derived #$count" &&
> > +		git rev-parse HEAD >derived$count &&
> > +		git checkout base || break
> > +	done &&
> > +
> > +	for count in 1 2 3 4 5
> > +	do
> > +		git merge-base --reflog base $(cat derived$count) >actual &&
> > +		test_cmp expect$count actual || break
> > +	done &&
> 
> This does not work as intended because the exit code of 'break' is always
> zero. Unlike 'exit' and 'return', it does *not* pick up the exit code of
> the last command that was executed.
> 
> That's annoying, but makes some sense because 'break 2' does not mean to
> apply exit code 2 to the command, either, but to break out of 2 levels of
> loops.
> 
> You could put the loops into a function from which you 'return', but that
> is obscure in this case. The first iteration was better, IMO.

Wouldn't it be simpler to just return from the test? That is, replace the "break" in the above patch with "return 1".

There's code in several other test cases (e.g. t3311) which handles the same problem like that.

Previous: Johannes SixtNext: Johannes Sixt
Message 17 of 35 in “rebase: use reflog to find common base with upstream”
  1. rebase: use reflog to find common base with upstreamJohn Keeping, Oct 16, 2013
  2. Jonathan NiederOct 16, 2013
  3. John KeepingOct 16, 2013
  4. Martin von ZweigbergkOct 21, 2013
  5. John KeepingOct 21, 2013
  6. Martin von ZweigbergkOct 22, 2013
  7. Junio C HamanoOct 24, 2013
  8. 0/2 finding the fork point from reflog entriesJunio C Hamano, Oct 24, 2013
  9. 1/2 merge-base: use OPT_CMDMODE and clarify the command line parsingJunio C Hamano, Oct 24, 2013
  10. 2/2 merge-base: "--reflog" mode finds fork point from reflog entriesJunio C Hamano, Oct 24, 2013
  11. Eric SunshineOct 24, 2013
  12. Junio C HamanoOct 24, 2013
  13. Eric SunshineOct 24, 2013
  14. Junio C HamanoOct 24, 2013
  15. 2/2 merge-base: "--reflog" mode finds fork point from reflog entriesJunio C Hamano, Oct 24, 2013
  16. Johannes SixtOct 25, 2013
  17. John KeepingOct 25, 2013
  18. Johannes SixtOct 25, 2013
  19. Junio C HamanoOct 25, 2013
  20. 2/2 merge-base: teach "--fork-point" modeJunio C Hamano, Oct 25, 2013
  21. Eric SunshineOct 25, 2013
  22. Martin von ZweigbergkOct 26, 2013
  23. Junio C HamanoOct 28, 2013
  24. John KeepingOct 26, 2013
  25. Junio C HamanoOct 28, 2013
  26. John KeepingOct 29, 2013
  27. Junio C HamanoOct 29, 2013
  28. John KeepingOct 24, 2013
  29. Junio C HamanoOct 24, 2013
  30. John KeepingOct 24, 2013
  31. John KeepingOct 24, 2013
  32. John KeepingOct 24, 2013
  33. Junio C HamanoOct 25, 2013
  34. Martin von ZweigbergkOct 22, 2013
  35. John KeepingOct 24, 2013

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.