From: Jakub Narebski <jnareb@gmail.com>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [RFC/PATCH] gitweb: Create special from-file/to-file header for combined diff
Date: Mon, 28 May 2007 08:50:51 +0200 [thread overview]
Message-ID: <200705280850.52323.jnareb@gmail.com> (raw)
In-Reply-To: <7v1wh1en8k.fsf@assigned-by-dhcp.cox.net>
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.
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
next prev parent reply other threads:[~2007-05-28 6:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-27 23:16 [PATCH] gitweb: Split git_patchset_body into separate subroutines Jakub Narebski
2007-05-27 23:16 ` [RFC/PATCH] gitweb: Create special from-file/to-file header for combined diff Jakub Narebski
2007-05-27 23:16 ` [PATCH] " Jakub Narebski
2007-05-27 23:33 ` Jakub Narebski
2007-05-28 1:43 ` [RFC/PATCH] " Junio C Hamano
2007-05-28 6:50 ` Jakub Narebski [this message]
2007-05-28 13:29 ` Petr Baudis
2007-05-28 14:22 ` Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200705280850.52323.jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.