-----Original Message----- From: Peter Pearse [mailto:peter.pearse@arm.com] Sent: 11 April 2008 09:47 To: 'Wolfgang Denk' Subject: RE: [U-Boot-Users] [GIT PULL] Please pull u-boot-arm
-----Original Message----- From: u-boot-users-bounces@lists.sourceforge.net [mailto:u-boot-users-bounces@lists.sourceforge.net] On Behalf Of Wolfgang Denk Sent: 10 April 2008 11:24 To: Peter Pearse; Guennadi Liakhovetski Cc: u-boot-users@lists.sourceforge.net Subject: Re: [U-Boot-Users] [GIT PULL] Please pull u-boot-arm
Dear Peter,
in message 000801c89255$d637b670$3a4d010a@Emea.Arm.com you wrote:
These are the patches:
--- snip ---
I would expect, that the state of the current repository represents what we get after applying Sascha's and Guennadi's patches (in the correct versions and order). Howver, the current tree looks totally different to me.
Can you please check with Guennadi what happened, how this can be cleaned up, and especially how this can be prevented in the future?
Note that there is not only not the expected state of the
source code,
but there is also corruption of meta-information again; for example:
-> git-show --pretty=fuller 7a837b7310166ae8fc8b8d66d7ef01b60a80f9d6 commit 7a837b7310166ae8fc8b8d66d7ef01b60a80f9d6 Author: Guennadi Liakhovetski <[lg@denx.de]> -------------------------------------------^^^^^^^^^^^^ AuthorDate: Sun Mar 30 11:32:30 2008 +0100 Commit: Peter Pearse peter.pearse@arm.com CommitDate: Sun Mar 30 11:32:30 2008 +0100
Support for the MX31ADS evaluation board from Freescale...
None of Guennadis messages on the mailing list ever used
something
like "[lg@denx.de]" - this must be something that happend
on your end
when processing his patches. Where are the brackets coming from? Don't you use git-am to apply the patches?
I find I have to manually edit the mails I get from my (company mandated) mail client.
My process is
a) Save mail b) Manually edit to remove extraneous/incorrect data and formatting c) Run mail thru <linux kernel>/scripts/checkpatch.pl until acceptable d) Run git-am, correcting the patch until applies without output other than re whitespace.
On the code my patch corrections e.g. for line length might differ from those applied by someone else.
Guennadis mail address corruption occurred because I missed an "on behalf of" in the patch mail.
I'm looking at Manus's mail to see where we differ...
Regards
Peter