From: Anton Vorontsov <avorontsov@ru.mvista.com>
To: Scott Wood <scottwood@freescale.com>
Cc: Becky Bruce <becky.bruce@freescale.com>,
linuxppc-dev@ozlabs.org, git@vger.kernel.org
Subject: Re: git apply vs. renamed files index mismatch
Date: Tue, 9 Sep 2008 01:54:41 +0400 [thread overview]
Message-ID: <20080908215441.GA924@oksana.dev.rtsoft.ru> (raw)
In-Reply-To: <48C59B71.3040902@freescale.com>
On Mon, Sep 08, 2008 at 04:38:57PM -0500, Scott Wood wrote:
> Anton Vorontsov wrote:
>> I always thought that posting "-M" patches to the public lists is
>> discouraged since it is quite difficult to apply them via patch(1).
>> Also think of non-git users...
>
> I think the substantially enhanced reviewability trumps non-git-users
> who can follow the rename instructions manually (or fix up their patch
> utility) if they insist on shunning tools that would make their life
> easier.
Can't disagree, I myself use git. ;-) But I'm also using standard
patch(1) to test occasional patches... And sometimes linux-X tree
isn't tracked by git (e.g. -mm otm snapshots).
>> diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
>> new file mode 100644
>> index 0000000..ae5708e
>> [...]
>> diff --git a/arch/powerpc/kernel/dma_64.c b/arch/powerpc/kernel/dma_64.c
>> deleted file mode 100644
>> index ae5708e..0000000
>>
>> That is, if hashes match then it was pure rename.
>
> I suppose, though it's not as easy to spot, and won't help in showing
> what the differences are if there are any.
..rename and changes ideally go in separate patches.
IIRC this also helps git to track renames (it can easily compare
hashes instead of guessing).
--
Anton Vorontsov
email: cbouatmailru@gmail.com
irc://irc.freenode.net/bd2
next prev parent reply other threads:[~2008-09-08 21:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1220900995-11928-1-git-send-email-becky.bruce@freescale.com>
[not found] ` <1220900995-11928-2-git-send-email-becky.bruce@freescale.com>
[not found] ` <48C57A92.6060608@freescale.com>
2008-09-08 21:27 ` git apply vs. renamed files index mismatch (was: Re: [PATCH 1/4] POWERPC: Rename dma_64.c to dma.c) Anton Vorontsov
2008-09-08 21:38 ` git apply vs. renamed files index mismatch Scott Wood
2008-09-08 21:54 ` Anton Vorontsov [this message]
2008-09-09 0:55 ` Junio C Hamano
2008-09-09 9:06 ` Geert Uytterhoeven
2008-09-08 21:58 ` git apply vs. renamed files index mismatch (was: Re: [PATCH 1/4] POWERPC: Rename dma_64.c to dma.c) Christoph Hellwig
2008-09-09 0:53 ` git apply vs. renamed files index mismatch Junio C Hamano
2008-09-09 10:06 ` Anton Vorontsov
2008-09-09 14:45 ` Junio C Hamano
2008-09-09 15:14 ` Anton Vorontsov
2008-09-10 3:31 ` 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=20080908215441.GA924@oksana.dev.rtsoft.ru \
--to=avorontsov@ru.mvista.com \
--cc=becky.bruce@freescale.com \
--cc=git@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=scottwood@freescale.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).