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

Re: Avoiding 'master' nomenclature

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 12, 2020, 00:30 UTC
Message-ID
<xmqq4kp8903z.fsf@gitster.c.googlers.com>
In-Reply-To
<nycvar.QRO.7.76.6.2008110430080.50@tvgsbejvaqbjf.bet>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> However, this might be overkill, and a bit more complicated to implement,
> as we now would also have to allow "negative" patterns.

Somebody may want to teach negative patterns to merge.suppressDest, so the implementation complexity in the end would not be all that different in the end, when that future happens. But until then, I tend to agree with you that it may be simpler if the matched ones are suppressed than mentioned (iow, the configuration variable, merge.suppressDest, would be simpler to manage than your hypothetical merge.mentionDest whose polarity is opposite).

That is primarily because I expect that the common usage patterns are the following three:

 - mention destination of merges into any and all branches;
 - mention destination of no merges;
 - mention destination of merges into all branches except for the
   primary integration branch.

A configuration variable with either polarity would express the first two equally well, but the last one (which is the primary use case for continuity reasons) is easier to express with suppressDest.

With mentionDest, you'd need two entries, i.e. 'all', and 'not this one', so you'd need a negative matching from the get-go. So from the point of view of end-user usability, not ease-of-implementation, I think Peff picked the right polarity in his suggestion.

Previous: Johannes SchindelinNext: Junio C Hamano
Message 40 of 42 in “Avoiding 'master' nomenclature”
  1. Linus TorvaldsJul 29, 2020
  2. Junio C HamanoJul 29, 2020
  3. Linus TorvaldsJul 29, 2020
  4. Jonathan NiederJul 29, 2020
  5. Linus TorvaldsJul 29, 2020
  6. Linus TorvaldsJul 29, 2020
  7. lego_12239@rambler.ruJul 30, 2020
  8. Jeff KingJul 31, 2020
  9. OlegJul 31, 2020
  10. Linus TorvaldsJul 29, 2020
  11. Jeff KingJul 29, 2020
  12. Linus TorvaldsJul 29, 2020
  13. Jeff KingJul 30, 2020
  14. Linus TorvaldsJul 30, 2020
  15. Jeff KingJul 30, 2020
  16. Linus TorvaldsJul 30, 2020
  17. Jeff KingJul 31, 2020
  18. Junio C HamanoJul 29, 2020
  19. Junio C HamanoJul 29, 2020
  20. Jeff KingJul 30, 2020
  21. Linus TorvaldsJul 30, 2020
  22. Michal SuchánekJul 30, 2020
  23. Jeff KingJul 30, 2020
  24. Junio C HamanoJul 30, 2020
  25. 0/2 fmt-merge-msg: selectively suppress "into <branch>"Junio C Hamano, Jul 30, 2020
  26. 2/2 fmt-merge-msg: allow merge destination to be omitted againJunio C Hamano, Jul 30, 2020
  27. 1/2 Revert "fmt-merge-msg: stop treating `master` specially"Junio C Hamano, Jul 30, 2020
  28. Eric SunshineJul 30, 2020
  29. Junio C HamanoJul 30, 2020
  30. Jeff KingJul 31, 2020
  31. Junio C HamanoJul 31, 2020
  32. Jeff KingJul 31, 2020
  33. Taylor BlauJul 31, 2020
  34. Junio C HamanoJul 31, 2020
  35. Taylor BlauJul 31, 2020
  36. Michal SuchánekAug 1, 2020
  37. Johannes SchindelinAug 10, 2020
  38. Junio C HamanoAug 10, 2020
  39. Johannes SchindelinAug 11, 2020
  40. Junio C HamanoAug 12, 2020
  41. Junio C HamanoJul 29, 2020
  42. Linus TorvaldsJul 29, 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.