[csw-devel] SF.net SVN: gar:[11608] csw/mgar/gar/v2/gar.lib.mk
bdwalton at users.sourceforge.net
bdwalton at users.sourceforge.net
Sun Nov 14 21:50:19 CET 2010
Revision: 11608
http://gar.svn.sourceforge.net/gar/?rev=11608&view=rev
Author: bdwalton
Date: 2010-11-14 20:50:19 +0000 (Sun, 14 Nov 2010)
Log Message:
-----------
gar/v2: tweak the heuristic that determines git vs non-git patches
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-11-14 18:49:34 UTC (rev 11607)
+++ csw/mgar/gar/v2/gar.lib.mk 2010-11-14 20:50:19 UTC (rev 11608)
@@ -516,7 +516,7 @@
# apply normal patches (git format-patch output or old-style diff -r)
normal-patch-%:
@echo " ==> Applying patch $(DOWNLOADDIR)/$*"
- @( if ggrep -q 'Subject:' $(abspath $(DOWNLOADDIR)/$*); then \
+ @( if ggrep -q 'diff --git' $(abspath $(DOWNLOADDIR)/$*); then \
cd $(WORKSRC); git am --ignore-space-change --ignore-whitespace $(abspath $(DOWNLOADDIR)/$*); \
else \
echo Adding old-style patch...; \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list