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

Re: RFC: Change whatchanged to report changes from merges by default?

From
MBMark Burton <markb@ordern.com>
Date
Dec 20, 2008, 17:22 UTC
Message-ID
<20081220172252.6469d9b7@crow>
In-Reply-To
<20081220104232.5ff1b7c0@crow>
Hi,

On further studying, I see that 1aec7917dc (git log: don't do merge diffs by default) makes git log only show the log message by default for merges. OK, no problem with that.

However, in my mind, whatchanged is misleading when it doesn't output anything (by default) for merges because, in my mind, that implies that nothing has changed when, in fact, whole heaps of stuff could have been merged in. So, if you forget to add the -m option, whatchanged will silently ignore all the merged stuff and leave the poor user in the dark.

So, if changing the default behaviour is acceptable, I still think it would be better if ignore_merges is set to 0 in cmd_whatchanged() but I guess an alternative would be to set always_show_header, instead.

Any thoughts?
Cheers,
Mark
Previous: Mark BurtonNext: Junio C Hamano
Message 2 of 4 in “RFC: Change whatchanged to report changes from merges by default?”
  1. Mark BurtonDec 20, 2008
  2. Mark BurtonDec 20, 2008
  3. Junio C HamanoDec 20, 2008
  4. Mark BurtonDec 20, 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.