From: Junio C Hamano <junkio@cox.net>
To: Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [RFC] gitweb TODO
Date: Fri, 17 Nov 2006 16:04:05 -0800 [thread overview]
Message-ID: <7vveldhb7u.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <200611172224.40252.jnareb@gmail.com> (Jakub Narebski's message of "Fri, 17 Nov 2006 22:24:39 +0100")
Jakub Narebski <jnareb@gmail.com> writes:
> ... But for gitweb more important than producing safe patch
> is producing _readable_ patch[*1*]. Hence request for -T option
> (or under other, better name) to git-diff which would _not_
> split patch (not create two patches for one raw difftree line).
>
> [*1*] Well, as far as diff for symlink is readable anyway.
Honestly, I do not have strong feeling either way. As you say,
I suspect diff to change between symlink and regular file is not
readable no matter how you present it, and it is a corner case
that is not very interesting. It happens in real life but it is
rare enough that split patches or a single patch would not make
much difference either way.
So I would not oppose to a patch to add an option to update
git-diff to produce either format, but I doubt it is worth the
effort required to make sure that the change does not break
anything else and also to make matching adjustment to git-apply,
so that it can understand both formats.
>> I am not sure what you mean by patchset part, but if you are
>> talking about the multiway diff text, I think most of the time
>> output from "-c -p" is much less interesting than "--cc".
>
> Sorry, perhaps I was not clear. I'd like for git-diff-tree --cc
> --raw -p to output both raw part (perhaps taken from -c) and
> patch part...
I can see why somebody might want to do this, to exactly the
same degree that I can see why somebody might want to use the
combination of "--raw -p".
I think this would work in git.git itself:
git diff-tree --cc --numstat --raw -p v1.0.0
prev parent reply other threads:[~2006-11-18 0:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-17 18:01 [RFC] gitweb TODO Jakub Narebski
2006-11-17 19:22 ` Junio C Hamano
2006-11-17 20:30 ` Jakub Narebski
2006-11-17 21:08 ` Junio C Hamano
2006-11-17 21:24 ` Jakub Narebski
2006-11-18 0:04 ` Junio C Hamano [this message]
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=7vveldhb7u.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
/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