Re: [RFC/PATCH] gitweb: Create special from-file/to-file header for combined diff

From: Petr Baudis <pasky@suse.cz>
Date: May 28, 2007, 13:29 UTC
Message-ID: <20070528132959.GT4489@pasky.or.cz>
In-Reply-To: <200705280850.52323.jnareb@gmail.com>

On Mon, May 28, 2007 at 08:50:51AM CEST, Jakub Narebski wrote:

Show 20 quoted lines

> Junio C Hamano wrote:
> > Jakub Narebski <jnareb@gmail.com> writes:
> > 
> >> Instead of using default, diff(1) like from-file/to-file header for
> >> combined diff (for a merge commit), which looks like:
> >>
> >>   --- a/git-gui/git-gui.sh
> >>   +++ b/_git-gui/git-gui.sh_
> >>
> >> (where _link_ denotes [hidden] hyperlink), create from-file(n)/to-file
> >> header, using n/file for each or parents, e.g.:
> >>
> >>   --- 1/_git-gui/git-gui.sh_
> >>   --- 2/_git-gui.sh_
> >>   +++ b/_git-gui/git-gui.sh_
> > 
> > Sounds quite straightforward to implement, and diff with 1/
> > would be useful to recreate what the person who did the merge
> > pulled in, for most of the time.  I suspect diff with 2/ is
> > almost always uninteresting, though.

I like it too.

> Errr... it _is_ implemented in this patch, although code is not perfect
> and has some unnecessary repetitions.

It just shows links to older versions of the blob, doesn't it? Links to diffs themselves would be useful too.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Ever try. Ever fail. No matter. // Try again. Fail again. Fail better.
		-- Samuel Beckett