Re: Avoiding uninteresting merges in Cairo

From: Shawn Pearce <spearce@spearce.org>
Date: Dec 15, 2006, 15:01 UTC
Message-ID: <20061215150130.GB17860@spearce.org>
In-Reply-To: <eluasq$v7q$3@sea.gmane.org>

Jakub Narebski <jnareb@gmail.com> wrote:

Show 12 quoted lines

> Carl Worth wrote:
> 
> > On Thu, 14 Dec 2006 22:25:30 -0500, Shawn Pearce wrote:
> 
> >>  * gitweb made it appear as though a whole lot of Carl's recent
> >>    work was somehow undone in the merge.
> > 
> > That looks like a simple gitweb bug. None of the other tools, (gitk,
> > git log -p), consider a trivial merge commit like this as having
> > anything interesting in it worth displaying.
> 
> It's not a bug, it is rather lack of feature (or misfeature).

Its a bug.

I'm not a gitweb user (meaning I almost never look at something in gitweb). But I'm clearly also not a Git newbie. ;-)

I could not fathom why that merge commit was being displayed that
way in gitweb.  I had to clone the cairo project just so I could
actually look at the commit with log/show/whatchanged/diff-tree,
because I couldn't believe what I was seeing from gitweb.