Date: Wed, 13 Apr 2016 11:28:58 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413203 - head Message-ID: <201604131128.u3DBSwpY015484@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Apr 13 11:28:57 2016 New Revision: 413203 URL: https://svnweb.freebsd.org/changeset/ports/413203 Log: Have make update work for a git only repository. PR: 195699 Submitted by: clutton zoho com Sponsored by: Absolight Modified: head/Makefile (contents, props changed) Modified: head/Makefile ============================================================================== --- head/Makefile Wed Apr 13 11:08:23 2016 (r413202) +++ head/Makefile Wed Apr 13 11:28:57 2016 (r413203) @@ -184,10 +184,17 @@ update: @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${SVN} update .elif exists(${.CURDIR}/.git) +. if exists(${.CURDIR}/.git/svn) @echo "--------------------------------------------------------------" @echo ">>> Updating ${.CURDIR} from git+svn repository" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${GIT} svn rebase +. else + @echo "--------------------------------------------------------------" + @echo ">>> Updating ${.CURDIR} from git repository" + @echo "--------------------------------------------------------------" + cd ${.CURDIR}; ${GIT} pull +. endif .elif defined(RSYNC_UPDATE) && defined(PORTS_RSYNC_SOURCE) @echo "--------------------------------------------------------------" @echo ">>> Updating with ${RSYNC} from ${PORTS_RSYNC_SOURCE}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604131128.u3DBSwpY015484>