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

Re: [PATCH v2] revision traversal: show full history with merge simplification

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 31, 2008, 08:18 UTC
Message-ID
<7vd4kuzcst.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<7vhca6zcuy.fsf@gitster.siamese.dyndns.org>

If you look at the output from the "kernel/printk.c" with this patch, you would notice that there still are somewhat meaningless merges shown in the history (e.g. scroll down to 185a257f2f73bcd89050ad02da5bedbc28fc43fa).

The mainline side keeps making steady changes to the path, but the side branch that made tty_write_message available to others with b346671 ([PATCH] Export tty_write_message() for GFS2 quota code, 2006-01-16) keeps many "Merge from master" until it is merged back to the mainline, even after the earlier change is reverted by 02630a1 ([GFS2] Remove dependance on tty_write_message(), 2006-07-03).

I wonder if we can do something clever to reduce these pointless (from the point of view of explaining kernel/printk.c's evolution, at least) merges from the output. This might be another example of the reason why it is a good thing that you keep teaching people: "On your xyzzy topic, you are doing xyzzy development, not xyzzy development plus random changes --- don't merge my tree into yours!", and we could dismiss these extra merges we see in the output as artifacts from a bad practice, but as long as we are spending extra cycles, it would be better if we could reduce such clutter.

I am still undecided about the option name.

The existing --full-history is "show history fully without simplifying the merge at all". This is "show history fully with merge simplification". Perhaps --simplify-merges?

Previous: Junio C HamanoNext: Linus Torvalds
Message 24 of 58 in “Bizarre missing changes (git bug?)”
  1. Tim HarperJul 21, 2008
  2. Linus TorvaldsJul 21, 2008
  3. Tim HarperJul 21, 2008
  4. Tim HarperJul 21, 2008
  5. Roman ZippelJul 26, 2008
  6. Linus TorvaldsJul 26, 2008
  7. Roman ZippelJul 27, 2008
  8. Linus TorvaldsJul 27, 2008
  9. Roman ZippelJul 27, 2008
  10. Linus TorvaldsJul 27, 2008
  11. Roman ZippelJul 28, 2008
  12. Linus TorvaldsJul 28, 2008
  13. Linus TorvaldsJul 28, 2008
  14. Roman ZippelJul 29, 2008
  15. Martin LanghoffJul 29, 2008
  16. Roman ZippelJul 30, 2008
  17. Martin LanghoffJul 30, 2008
  18. Linus TorvaldsJul 30, 2008
  19. Linus TorvaldsJul 30, 2008
  20. Junio C HamanoJul 30, 2008
  21. Junio C HamanoJul 31, 2008
  22. Linus TorvaldsJul 31, 2008
  23. revision traversal: show full history with merge simplificationJunio C Hamano, Jul 31, 2008
  24. Junio C HamanoJul 31, 2008
  25. Linus TorvaldsJul 31, 2008
  26. revision traversal: show full history with merge simplificationJunio C Hamano, Jul 31, 2008
  27. Linus TorvaldsJul 31, 2008
  28. Junio C HamanoJul 31, 2008
  29. Junio C HamanoAug 1, 2008
  30. Linus TorvaldsAug 1, 2008
  31. Junio C HamanoAug 1, 2008
  32. Jakub NarebskiJul 30, 2008
  33. Linus TorvaldsJul 29, 2008
  34. Linus TorvaldsJul 29, 2008
  35. Roman ZippelJul 29, 2008
  36. David KastrupJul 29, 2008
  37. Linus TorvaldsJul 29, 2008
  38. Roman ZippelJul 30, 2008
  39. Kevin BallardJul 30, 2008
  40. Linus TorvaldsJul 30, 2008
  41. Jeff KingJul 29, 2008
  42. Roman ZippelJul 29, 2008
  43. Olivier GalibertJul 29, 2008
  44. Jeff KingJul 29, 2008
  45. Linus TorvaldsJul 29, 2008
  46. Roman ZippelJul 30, 2008
  47. Linus TorvaldsJul 30, 2008
  48. Jeff KingJul 30, 2008
  49. Linus TorvaldsJul 30, 2008
  50. Roman ZippelJul 30, 2008
  51. Kevin BallardJul 30, 2008
  52. Linus TorvaldsJul 30, 2008
  53. Linus TorvaldsJul 30, 2008
  54. Jeff KingJul 30, 2008
  55. Martin LanghoffJul 27, 2008
  56. Roman ZippelJul 28, 2008
  57. Alex RiesenJul 21, 2008
  58. Linus TorvaldsJul 21, 2008

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.