On Tue, Aug 11, 2009 at 09:01:28AM -0600, Brian Paul wrote: > However, I always have trouble applying your patches with git-am: > $ git-am 0001-egl-Add-eglmutex.h.patch > Applying egl: Add eglmutex.h. > .dotest/patch:15: trailing whitespace. > eglmutex.h \ > fatal: git-apply: bad git-diff - expected /dev/null on line 22 > Patch failed at 0001. > When you have resolved this problem run "git-am --resolved". > If you would prefer to skip this patch, instead run "git-am --skip". > If I use 'patch -p1 < 0001-egl-Add-eglmutex.h.patch' it works but > still complains about whitespace: > $ patch -p1 --dry-run < 0001-egl-Add-eglmutex.h.patch > (Stripping trailing CRs from patch.) > patching file src/egl/main/Makefile > (Stripping trailing CRs from patch.) > patching file src/egl/main/eglmutex.h > Do you (or anyone else) have any idea what's causing this? That's weird. On my machines (debian unstable and debian testing)
$ git am 0001-egl-Add-eglmutex.h.patch Applying: egl: Add eglmutex.h. I thought it was the version of git, but I was wrong because patch (v2.5.9) works fine too $ git reset --hard HEAD^ $ patch -p1 --dry-run < 0001-egl-Add-eglmutex.h.patch patching file src/egl/main/Makefile patching file src/egl/main/eglmutex.h Could it be that the patches are formatted in some way? The SHA1 of the first patch here is $ sha1sum 0001-egl-Add-eglmutex.h.patch d22ae0db699372fb74ae822b3d081968f2c3713b 0001-egl-Add-eglmutex.h.patch -- Regards, olv ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
