From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 May 2012 22:21:46 +0000 (-0700)
Subject: Merge branch 'ld/git-p4-tags-and-labels'
X-Git-Tag: v1.7.11-rc0~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b994b1c4e87008582fa5f57121f73f4fc940054;p=thirdparty%2Fgit.git

Merge branch 'ld/git-p4-tags-and-labels'

By Luke Diamand
* ld/git-p4-tags-and-labels:
  git p4: fix bug when enabling tag import/export via config variables
  git p4: fix bug when verbose enabled with tag export
  git p4: add test for tag import/export enabled via config
---

9b994b1c4e87008582fa5f57121f73f4fc940054