Git development
 help / color / mirror / Atom feed
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 13:08:07 -0800	[thread overview]
Message-ID: <7vu00xixxk.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <200611172130.11631.jnareb@gmail.com> (Jakub Narebski's message of "Fri, 17 Nov 2006 21:30:11 +0100")

Jakub Narebski <jnareb@gmail.com> writes:

> What about the fact that git-diff -M is _not_ patch-compatibile;

What about it?  I've never said patch compatibility is an issue.
We have something patch cannot represent or understand and you
should admit it.  The point is to make it easier to massage by
hand, when the recipient does not have git handy.

With -M, the recipient can read and understand the patch text
better than "remove this oldfile and create this newfile that
the diff output does not tell you is related" diff.  And we say
"rename" in plain language so the recipient _can_ do "mv A B"
then "patch -p1".  Similarly, with -T that changes a symlink
into a real file, if we do not do the current "remove the old
and then create the new" and did instead "show the textual diff
that can be applied", a non-git tool that does not understand
the typechange can mistakenly muck with the target of the
symlink, which is a disaster.  "Remove the target and then
create this" at least would have lesser damage -- the object
left as the result is incorrect nevertheless, but reading the
contents and creating a symlink that has that contents by hand
is easily done in a pinch.

> We should have whatchanged part corresponding to the patchset
> part at least in "commitdiff" view, which means '-c' (and for
> the time being perhaps mean '-c' also in patchset part). '--cc'
> which uses '-c' for the raw part would be nice...

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".



  reply	other threads:[~2006-11-17 21:08 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 [this message]
2006-11-17 21:24       ` Jakub Narebski
2006-11-18  0:04         ` 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=7vu00xixxk.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