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

Re: [PATCH v3 2/2] merge-base: teach "--fork-point" mode

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 28, 2013, 19:13 UTC
Message-ID
<xmqq38nlfbu5.fsf@gitster.dls.corp.google.com>
In-Reply-To
<20131026090034.GH10779@serenity.lan>
John Keeping <john@keeping.me.uk> writes:
> The --reflog name has the advantage that it makes clear that this is
> looking at something more than the commit graph and I don't think
> --fork-point does imply that.

I think I understand what you are saying, but that "more than the commit graph" part in your reasoning is exactly one of the two reasons why I do not think that it is a good idea to call it with "reflog" in its name. The next round of update to the feature may find a better way to find the fork point than looking at the reflog. What the feature is meant to do, i.e. "find the fork point" can stay the same (i.e. people can use it in their script), while the way how the implementation achieves it (i.e. by looking at reflog) can evolve over time, and by not hardcoding "how" in the name, the users will benefit from the updated behaviour, without having to ask for a better heuristics by using a different option by updating all of their scripts.

The other reason (of my two reasons) is because I do not think "finding the fork-point" will stay to be the _only_ feature that uses reflog in merge-base. When a next cool feature to compute something completely different from fork-point happens to be implemented by taking advantage of reflog data, what would we call it?

Previous: John KeepingNext: John Keeping
Message 25 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.