From: Andreas Schwab <schwab@linux-m68k.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Andreas Gruenbacher <agruen@suse.de>, git@vger.kernel.org
Subject: Re: Filename quoting / parsing problem
Date: Wed, 06 Jan 2010 11:06:15 +0100 [thread overview]
Message-ID: <m2eim3wns8.fsf@whitebox.home> (raw)
In-Reply-To: <7viqbgniq1.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Tue, 05 Jan 2010 17:08:06 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> So you can (and I think git-apply does) follow this simple rule:
>
> If you see +++/---/rename from/rename to/new file/deleted file, use
> the names you find there. Otherwise, because there is no rename,
> "diff --git" lines has two identical names that follow a/ and b/, so
> use that name.
If you use diff.mnemonicprefix=true then a/ and b/ may be different.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
prev parent reply other threads:[~2010-01-09 12:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-01 17:44 Filename quoting / parsing problem Andreas Gruenbacher
2010-01-01 19:50 ` Junio C Hamano
2010-01-01 20:01 ` Junio C Hamano
2010-01-02 11:36 ` Andreas Gruenbacher
2010-01-02 18:37 ` Junio C Hamano
2010-01-02 20:48 ` Andreas Gruenbacher
2010-01-06 0:04 ` Andreas Gruenbacher
2010-01-06 1:32 ` Junio C Hamano
2010-01-06 1:08 ` Junio C Hamano
2010-01-06 10:06 ` Andreas Schwab [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=m2eim3wns8.fsf@whitebox.home \
--to=schwab@linux-m68k.org \
--cc=agruen@suse.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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;
as well as URLs for NNTP newsgroup(s).