Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Aug 2012 17:06:49 +0000 (UTC)
From:      Beat Gaetzi <beat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r302115 - head
Message-ID:  <201208051706.q75H6nwC005681@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: beat
Date: Sun Aug  5 17:06:49 2012
New Revision: 302115
URL: http://svn.freebsd.org/changeset/ports/302115

Log:
  - 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@

Modified:
  head/Makefile

Modified: head/Makefile
==============================================================================
--- head/Makefile	Sun Aug  5 16:58:59 2012	(r302114)
+++ head/Makefile	Sun Aug  5 17:06:49 2012	(r302115)
@@ -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}"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208051706.q75H6nwC005681>