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

Re: Avoiding uninteresting merges in Cairo

From
Shawn Pearce <spearce@spearce.org>
Date
Dec 15, 2006, 16:03 UTC
Message-ID
<20061215160303.GG17860@spearce.org>
In-Reply-To
<200612151657.06909.jnareb@gmail.com>
Jakub Narebski <jnareb@gmail.com> wrote:
> Do you mean "commit" view or "commitdiff" view in gitweb for merges
> is confusing?
The commit view was what was confusing me.
Show 5 quoted lines
> If it is "commit" view, it is fairly easy to remove difftree/whatchanged
> output below commit message for merges. However while git-show nor 
> git-diff-tree doesn't show diff for merge messages, the diftree output
> in "commit" view might be taken as 'damages'; git diff --summary always
> takes summary of diff against first parent.

I can see that, but it depends on what the current branch was when you do the merge. In the cairo case I was looking at yesterday the "damages" from the merge were actually what was already considered to be in the mainline as part of the project due to committer pulling the remote master into his own master before pushing.

Given that the "push; whoops; pull; push" pattern is so common to Git I think it is sort of misleading to show a merge like this; lots of activity may have been pulled in from the central branch during that pull.

iirc git whatchanged for a merge shows only files which cannot be found in any of the parents; these the files which the merge commit itself contributed directly. If that set is empty then the commit just isn't shown by git whatchanged.

Previous: Jakub NarebskiNext: Jakub Narebski
Message 2 of 3 in “Re: Avoiding uninteresting merges in Cairo”
  1. Jakub NarebskiDec 15, 2006
  2. Shawn PearceDec 15, 2006
  3. gitweb: Do not show difftree for merges in "commit" viewJakub Narebski, Dec 15, 2006

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.