[csw-devel] SF.net SVN: gar:[10085] csw/mgar/gar/v2/gar.lib.mk

[bdwalton at users.sourceforge.net]

Revision: 10085
          http://gar.svn.sourceforge.net/gar/?rev=10085&view=rev
Author:   bdwalton
Date:     2010-06-03 15:45:19 +0000 (Thu, 03 Jun 2010)

Log Message:
-----------
gar/v2: git/patch: make git am more forgiving of whitespace/line ending issues (think DOS formatted files from upstream)

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.lib.mk

Modified: csw/mgar/gar/v2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2/gar.lib.mk	2010-06-03 15:25:31 UTC (rev 10084)
+++ csw/mgar/gar/v2/gar.lib.mk	2010-06-03 15:45:19 UTC (rev 10085)
@@ -475,7 +475,7 @@
 normal-patch-%:
 	@echo " ==> Applying patch $(DOWNLOADDIR)/$*"
 	@( if ggrep -q 'Subject:' $(abspath $(DOWNLOADDIR)/$*); then \
-		cd $(WORKSRC); git am $(abspath $(DOWNLOADDIR)/$*); \
+		cd $(WORKSRC); git am --ignore-space --ignore-whitespace $(abspath $(DOWNLOADDIR)/$*); \
 	   else \
 		echo Adding old-style patch...; \
 		$(GARPATCH) < $(DOWNLOADDIR)/$*; \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.