From: Junio C Hamano <gitster@pobox.com>
To: Nathan Collins <nathan.collins@gmail.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>, git <git@vger.kernel.org>
Subject: Re: [BUG?] Patches created with 'diff.noprefix=true' don't 'git apply'.
Date: Thu, 08 May 2014 09:56:19 -0700 [thread overview]
Message-ID: <xmqqa9as5hvw.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAO8RVvfzP_nc9=nwr6JSK9s6u7DEctMpdn_5yca9h7G4TOd2Bw@mail.gmail.com> (Nathan Collins's message of "Wed, 7 May 2014 16:39:45 -0700")
Nathan Collins <nathan.collins@gmail.com> writes:
>> What would you propose to make clickable in a renaming diff, though?
>
> Your 'Index' header looks good, and I would expect a renaming diff to
> have something like
>
> Index: foo -> bar
>
> as in 'git status',
Heh, please don't call "Index:" *mine* --- It is a CVS abomination
;-).
For renames and copies, we do have separate "rename from" and
"rename to" in the extended header part, so there is no reason to
worry about them at all. I would suggest showing the name _after_
the change (unless it is a deletion---instead of showing /dev/null
to signal that it was deleted, show the original filename) for
consistency so that users can do "show -p | grep '^Index: ' to see
what resulting paths there are without missing the renamed ones.
> but I just realized that a "clickable paths"
> option already exists in some sense! There is a '--patch-with-raw'
> option...
I do not think that would be useful (neither --stat which would be
more commonly used for other reasosn), because these come at the top
and by the time you see individual patch, they may be long scrolled
off the top of the screen.
Of course, the CVS "Index:" or "rename to" would be the same thing
if a file is heavily modified, so it may not be too big a deal, but
as I said, I never felt any need to double-click, so I wouldn't be
the best judge.
prev parent reply other threads:[~2014-05-08 16:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-01 1:36 [BUG?] Patches created with 'diff.noprefix=true' don't 'git apply' Nathan Collins
2014-05-01 2:40 ` Jonathan Nieder
2014-05-06 1:33 ` Nathan Collins
2014-05-06 1:59 ` Jonathan Nieder
2014-05-06 18:10 ` Junio C Hamano
2014-05-06 19:36 ` Nathan Collins
2014-05-06 21:12 ` Junio C Hamano
2014-05-07 1:16 ` Nathan Collins
2014-05-07 18:42 ` Junio C Hamano
2014-05-07 23:39 ` Nathan Collins
2014-05-08 4:38 ` Nathan Collins
2014-05-08 4:53 ` Nathan Collins
2014-05-08 16:56 ` 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=xmqqa9as5hvw.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=nathan.collins@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 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.