From: Petr Baudis Date: Fri, 22 Jul 2005 21:03:52 GMT Subject: Re: Should cg-mkpatch output be usable with cg-patch? Message-ID: <20050722210352.GG11916@pasky.ji.cz> In-Reply-To: <20050720234904.B3ED735267C@atlas.denx.de> Dear diary, on Thu, Jul 21, 2005 at 01:49:04AM CEST, I got a letter where Wolfgang Denk told me that... > I wander what I should do with "cg-mkpatch" generated output; I had > the impression that this should be usable with "cg-patch", but these > are incompatible with each other. They certainly aren't. > Forexample. if a commit contains permission changes, my generated > patch may look like this: > > ... > diff --git a/MAKEALL b/MAKEALL > old mode 100644 > new mode 100755 > diff --git a/mkconfig b/mkconfig > old mode 100644 > new mode 100755 > diff --git a/tools/img2brec.sh b/tools/img2brec.sh > old mode 100644 > new mode 100755 > ... > > If I feed this into "cg-patch", I get: > > patch: **** Only garbage was found in the patch input. And did the changes apply? :-) The message is surely confusing, but appeared to be rather corner-casy and after I imagined the required complexity of filtering this, I decided to spend my time on something more useful for the time being. :) -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ If you want the holes in your knowledge showing up try teaching someone. -- Alan Cox