[csw-devel] SF.net SVN: gar:[9815] csw/mgar/gar/v2-bwalton/gar.lib.mk
bdwalton at users.sourceforge.net
bdwalton at users.sourceforge.net
Wed May 5 04:25:29 CEST 2010
Revision: 9815
http://gar.svn.sourceforge.net/gar/?rev=9815&view=rev
Author: bdwalton
Date: 2010-05-05 02:25:29 +0000 (Wed, 05 May 2010)
Log Message:
-----------
gar/v2-bwalton: commit each patch after application, no more modulation detection based on presence of .git/
Modified Paths:
--------------
csw/mgar/gar/v2-bwalton/gar.lib.mk
Modified: csw/mgar/gar/v2-bwalton/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2-bwalton/gar.lib.mk 2010-05-05 02:20:42 UTC (rev 9814)
+++ csw/mgar/gar/v2-bwalton/gar.lib.mk 2010-05-05 02:25:29 UTC (rev 9815)
@@ -472,22 +472,17 @@
@$(MAKECOOKIE)
# apply normal patches (git format-patch output or old-style diff -r)
-# git should only be used in $(WORKSRC_FIRSTMOD)
normal-patch-%:
@echo " ==> Applying patch $(DOWNLOADDIR)/$*"
- @( if [ -d "$(abspath $(WORKSRC)/.git)" ]; then \
- if ggrep -q 'Subject:' $(abspath $(DOWNLOADDIR)/$*); then \
- echo Adding git-style patch...; \
- cd $(WORKSRC); git am $(abspath $(DOWNLOADDIR)/$*); \
- else \
- echo Adding old-style patch...; \
- $(GARPATCH) < $(DOWNLOADDIR)/$*; \
- cd $(WORKSRC); git add -A; \
- git commit -am "old style patch: $*"; \
- fi; \
- else \
+ @( if ggrep -q 'Subject:' $(abspath $(DOWNLOADDIR)/$*); then \
+ echo Adding git-style patch...; \
+ cd $(WORKSRC); git am $(abspath $(DOWNLOADDIR)/$*); \
+ else \
+ echo Adding old-style patch...; \
$(GARPATCH) < $(DOWNLOADDIR)/$*; \
- fi )
+ cd $(WORKSRC); git add -A; \
+ git commit -am "old style patch: $*"; \
+ fi )
@$(MAKECOOKIE)
### PATCH FILE TYPE MAPPINGS ###
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