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

Junio C Hamano wrote:

Jakub Narebski [off-list ref] writes:

quoted

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.

Errr... it _is_ implemented in this patch, although code is not perfect
and has some unnecessary repetitions. But I thought before improving
code would it make sense to do this... and perhaps even add generated
extended diff headers for renames:

  rename at _2_ parent from _git-gui.sh_
  rename to _git-gui/git-gui.sh_

where as before _link_ denotes hyperlinked part. Hmmm?

-- 
Jakub Narebski
Poland