git-package: Fix git fetch from a branch

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Sep 25 11:26:26 2015 +0200
Changeset:	da9bd6c1bae15b2bab8e4ee78f45374aeb72a315

Modified Files:
	mk/git-package.mk

Log Message:
git-package: Fix git fetch from a branch

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=da9bd6c1bae15b2bab8e4ee78f45374aeb72a315

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mk/git-package.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diffs:
diff --git a/mk/git-package.mk b/mk/git-package.mk
index cba08a1..fe02dcd 100644
--- a/mk/git-package.mk
+++ b/mk/git-package.mk
@@ -79,7 +79,7 @@ GIT_MODULE.${repo}?=	${repo}
 
 # determine appropriate checkout date or tag
 .  if defined(GIT_BRANCH.${repo})
-_GIT_TAG_FLAG.${repo}=	-b${GIT_BRANCH.${repo}}
+_GIT_TAG_FLAG.${repo}=	--branch ${GIT_BRANCH.${repo}}
 _GIT_TAG.${repo}=	${GIT_BRANCH.${repo}}
 .  elif defined(GIT_TAG.${repo})
 _GIT_TAG_FLAG.${repo}=	-r${GIT_TAG.${repo}}
@@ -100,7 +100,7 @@ _GIT_DISTNAME_SHA1_CMD= \
 	| cut -f1
 _GIT_DISTNAME_SHA1=	${_GIT_DISTNAME_SHA1_CMD:sh}
 _GIT_DISTFILE.${repo}=	${PKGBASE}-${GIT_MODULE.${repo}}-${_GIT_DISTNAME_SHA1:Q}.tar.gz
-.  elif defined(GIT_TAG.${repo}) || defined(GIT_TAG)
+.  else
 _GIT_DISTFILE.${repo}=	${PKGBASE}-${GIT_MODULE.${repo}}-${_GIT_TAG.${repo}:Q}.tar.gz
 .  endif
 
@@ -130,8 +130,10 @@ do-git-extract:
 	${SETENV} ${_GIT_ENV}						\
 		${_GIT_CMD} clone					\
 			${_GIT_FLAGS}		 			\
+			${_GIT_TAG_FLAG.${_repo_}}			\
 			${GIT_REPO.${_repo_}:Q};			\
 	${_GIT_CREATE_CACHE.${_repo_}}
+
 .endfor
 
 .endif