aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBeat Gaetzi <beat@FreeBSD.org>2012-08-05 17:06:49 +0000
committerBeat Gaetzi <beat@FreeBSD.org>2012-08-05 17:06:49 +0000
commitedc5aa1499e29c09bbaa094408bd5031c83ab1ee (patch)
tree61d24a986827772fb3b8ee6723d7f71f23d0236b /Makefile
parenta2e356d73de0168b26039fc7af3e914445f02d94 (diff)
downloadports-edc5aa1499e29c09bbaa094408bd5031c83ab1ee.tar.gz
ports-edc5aa1499e29c09bbaa094408bd5031c83ab1ee.zip
- Don't use SVN variable in 'git svn rebase' as setting the SVN variable to
a non-default value will break git. Submitted by: bf@, melifaro@
Notes
Notes: svn path=/head/; revision=302115
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e6655400421d..960f67784479 100644
--- a/Makefile
+++ b/Makefile
@@ -181,7 +181,7 @@ update:
@echo "--------------------------------------------------------------"
@echo ">>> Updating ${.CURDIR} from git+svn repository"
@echo "--------------------------------------------------------------"
- cd ${.CURDIR}; ${GIT} ${SVN} rebase
+ cd ${.CURDIR}; ${GIT} svn rebase
.else
@echo "--------------------------------------------------------------"
@echo ">>> Running ${PORTSNAP}"