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

Re: [PATCH v2 0/7] making log --first-parent imply -m

From
Jeff King <peff@peff.net>
Date
Aug 3, 2020, 18:08 UTC
Message-ID
<20200803180824.GA2711830@coredump.intra.peff.net>
In-Reply-To
<87o8nrybnb.fsf@osv.gnss.ru>
On Mon, Aug 03, 2020 at 06:47:20PM +0300, Sergey Organov wrote:
Show 5 quoted lines
> > A command line option that takes _optional_ argument is evil; it
> > hurts teachability (e.g. "why does this option always require
> > "--opt=val" and refuses '--opt val'?").
> 
> Yeah, I sympathize.

Sorry, the optional argument was my suggestion. I don't think they're that evil, but I agree they require extra knowledge for the user. I don't mind avoiding them when possible (and it's definitely possible here).

Show 8 quoted lines
> > Introduce --diff-parent=(none|<parent-number>|c|cc|all) that is
> > different from --diff-merges, and -m and --[no-]diff-merges can be
> > defined in terms of that, at which point we can gradually deprecate
> > them if we wanted to, no?
> 
> Sounds great, I only hoped we can do it right now, with this new
> --diff-merges option, maybe as a pre-requisite to the patches in
> question, but Jeff said it's too late, dunno why.

It's too late for "-m" to change semantics (we could do a long deprecation, but I don't see much point in doing so). But --diff-merges is definitely still changeable until we release v2.29. My resistance was mostly that I didn't want to complicate my series by adding new elements. But we could do something on top.

-Peff
Previous: Sergey OrganovNext: Sergey Organov
Message 40 of 86 in “making --first-parent imply -m”
  1. 0/3 making --first-parent imply -mJeff King, Jul 28, 2020
  2. 1/3 log: drop "--cc implies -m" logicJeff King, Jul 28, 2020
  3. 2/3 revision: add "--ignore-merges" option to counteract "-m"Jeff King, Jul 28, 2020
  4. Chris TorekJul 28, 2020
  5. Jeff KingJul 29, 2020
  6. Junio C HamanoJul 28, 2020
  7. Jeff KingJul 29, 2020
  8. Jeff KingJul 29, 2020
  9. Junio C HamanoJul 29, 2020
  10. 3/3 log: enable "-m" automatically with "--first-parent"Jeff King, Jul 28, 2020
  11. Jeff KingJul 28, 2020
  12. Junio C HamanoJul 28, 2020
  13. Jeff KingJul 28, 2020
  14. Taylor BlauJul 28, 2020
  15. 0/7 making log --first-parent imply -mJeff King, Jul 29, 2020
  16. 1/7 log: drop "--cc implies -m" logicJeff King, Jul 29, 2020
  17. 2/7 revision: add "--no-diff-merges" option to counteract "-m"Jeff King, Jul 29, 2020
  18. 3/7 log: enable "-m" automatically with "--first-parent"Jeff King, Jul 29, 2020
  19. Junio C HamanoJul 29, 2020
  20. 4/7 doc/git-log: move "Diff Formatting" from rev-list-optionsJeff King, Jul 29, 2020
  21. Junio C HamanoJul 29, 2020
  22. Jeff KingJul 29, 2020
  23. 5/7 doc/git-log: drop "-r" diff optionJeff King, Jul 29, 2020
  24. 6/7 doc/git-log: move "-t" into diff-options listJeff King, Jul 29, 2020
  25. Junio C HamanoJul 29, 2020
  26. Jeff KingJul 29, 2020
  27. 7/7 doc/git-log: clarify handling of merge commit diffsJeff King, Jul 29, 2020
  28. Chris TorekJul 29, 2020
  29. Sergey OrganovJul 29, 2020
  30. Jeff KingJul 31, 2020
  31. Sergey OrganovAug 2, 2020
  32. Junio C HamanoAug 2, 2020
  33. Sergey OrganovAug 3, 2020
  34. Junio C HamanoAug 3, 2020
  35. Sergey OrganovAug 3, 2020
  36. Junio C HamanoAug 3, 2020
  37. Sergey OrganovAug 3, 2020
  38. Jeff KingAug 3, 2020
  39. Sergey OrganovAug 3, 2020
  40. Jeff KingAug 3, 2020
  41. Sergey OrganovAug 3, 2020
  42. Jeff KingAug 3, 2020
  43. Sergey OrganovAug 3, 2020
  44. Sergey OrganovAug 4, 2020
  45. Junio C HamanoAug 4, 2020
  46. Jeff KingAug 4, 2020
  47. Sergey OrganovAug 4, 2020
  48. Jeff KingAug 4, 2020
  49. Junio C HamanoAug 4, 2020
  50. Sergey OrganovAug 4, 2020
  51. Jeff KingAug 4, 2020
  52. Junio C HamanoAug 4, 2020
  53. Jeff KingAug 7, 2020
  54. Sergey OrganovAug 7, 2020
  55. Junio C HamanoAug 7, 2020
  56. Sergey OrganovAug 7, 2020
  57. Junio C HamanoAug 7, 2020
  58. Sergey OrganovAug 7, 2020
  59. Jeff KingAug 7, 2020
  60. Sergey OrganovAug 7, 2020
  61. Junio C HamanoAug 7, 2020
  62. Sergey OrganovAug 7, 2020
  63. Junio C HamanoAug 7, 2020
  64. Sergey OrganovAug 7, 2020
  65. Junio C HamanoAug 7, 2020
  66. Sergey OrganovAug 7, 2020
  67. Sergey OrganovAug 4, 2020
  68. Sergey OrganovAug 4, 2020
  69. Jeff KingAug 4, 2020
  70. Jeff KingAug 4, 2020
  71. Sergey OrganovAug 4, 2020
  72. Jeff KingAug 4, 2020
  73. Sergey OrganovAug 4, 2020
  74. Jeff KingAug 4, 2020
  75. Sergey OrganovAug 4, 2020
  76. Junio C HamanoAug 4, 2020
  77. Sergey OrganovAug 4, 2020
  78. Sergey OrganovAug 4, 2020
  79. Jeff KingAug 4, 2020
  80. revision: fix die() message for "--unpacked="Sergey Organov, Aug 4, 2020
  81. Junio C HamanoAug 5, 2020
  82. Sergey OrganovAug 5, 2020
  83. Junio C HamanoAug 5, 2020
  84. Sergey OrganovAug 5, 2020
  85. Junio C HamanoAug 5, 2020
  86. Sergey OrganovAug 5, 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.