diff options
author | Mathieu Arnold <mat@FreeBSD.org> | 2016-04-13 11:28:57 +0000 |
---|---|---|
committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-04-13 11:28:57 +0000 |
commit | 4ad5e31e4ed97f85cf1df0e58f6519baf586dee5 (patch) | |
tree | 147e0da3de3e927ecfed8e98e858b8b6b0462316 /Makefile | |
parent | Remove libmcs (diff) |
Have make update work for a git only repository.
PR: 195699
Submitted by: clutton zoho com
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=413203
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -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}" |