From: Jakub Narebski <jnareb@gmail.com>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 0/6] gitweb: Add combined diff support
Date: Tue, 8 May 2007 03:50:25 +0200 [thread overview]
Message-ID: <200705080350.26061.jnareb@gmail.com> (raw)
In-Reply-To: <7vvef45cev.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano wrote:
> I've minimally tried this on my private machine. Looks pretty
> nice for simple merges, but I think we would want --cc not -c
> most of the time.
Please note that --cc would need some changes to both git_difftree_body
and git_patchset_body; it is not just matter of replacing
'-c' by '--cc'. Hunk simplification might mean that whole patch
vanishes. So sometimes we have difftree (raw diff, whatchanged) line
which does not have corresponding patch, and there should be no "patch"
link (this is harder part). This mean also that in git_patchset_body we
need sometimes to skip some difftree line / difftree info line (this is
easier part).
--
Jakub Narebski
Poland
next prev parent reply other threads:[~2007-05-08 1:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-06 23:10 [PATCH 0/6] gitweb: Add combined diff support Jakub Narebski
2007-05-06 23:10 ` [PATCH 1/6] gitweb: Add parsing of raw combined diff format to parse_difftree_raw_line Jakub Narebski
2007-05-06 23:10 ` [PATCH 2/6] gitweb: Add combined diff support to git_difftree_body Jakub Narebski
2007-05-06 23:10 ` [PATCH 3/6] gitweb: Add combined diff support to git_patchset_body Jakub Narebski
2007-05-06 23:10 ` [PATCH 4/6] gitweb: Make it possible to use pre-parsed info in git_difftree_body Jakub Narebski
2007-05-06 23:10 ` [PATCH 5/6] gitweb: Show combined diff for merge commits in 'commitdiff' view Jakub Narebski
2007-05-06 23:10 ` [PATCH 6/6] gitweb: Show combined diff for merge commits in 'commit' view Jakub Narebski
2007-05-06 23:10 ` [PATCH 7/6] todo: Remove "Gitweb diff on merge commits" entry Jakub Narebski
2007-05-08 1:31 ` [PATCH 0/6] gitweb: Add combined diff support Junio C Hamano
2007-05-08 1:50 ` Jakub Narebski [this message]
2007-05-16 22:05 ` [PATCH 7/6] gitweb: Empty patch for merge means trivial merge, not no differences Jakub Narebski
2007-05-16 22:08 ` Junio C Hamano
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=200705080350.26061.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).