summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-17 22:21:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-05-17 22:21:46 (GMT)
commit9b994b1c4e87008582fa5f57121f73f4fc940054 (patch)
tree2029f27353cf1d190649d8e38cb7c6349c5431e6 /git-p4.py
parent2b26b65f9abc77c4af87626452005a73edda0c8f (diff)
parent06dcd152a81ccff5464c34ed95306196763c9e65 (diff)
downloadgit-9b994b1c4e87008582fa5f57121f73f4fc940054.zip
git-9b994b1c4e87008582fa5f57121f73f4fc940054.tar.gz
git-9b994b1c4e87008582fa5f57121f73f4fc940054.tar.bz2
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
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-p4.py b/git-p4.py
index 565cfbc..f895a24 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1302,7 +1302,7 @@ class P4Submit(Command, P4UserMap):
if not m.match(name):
if verbose:
- print "tag %s does not match regexp %s" % (name, validTagRegexp)
+ print "tag %s does not match regexp %s" % (name, validLabelRegexp)
continue
# Get the p4 commit this corresponds to
@@ -1451,7 +1451,7 @@ class P4Submit(Command, P4UserMap):
rebase.rebase()
if gitConfig("git-p4.exportLabels", "--bool") == "true":
- self.exportLabels = true
+ self.exportLabels = True
if self.exportLabels:
p4Labels = getP4Labels(self.depotPath)
@@ -2711,7 +2711,7 @@ class P4Sync(Command, P4UserMap):
sys.stdout.write("\n")
if gitConfig("git-p4.importLabels", "--bool") == "true":
- self.importLabels = true
+ self.importLabels = True
if self.importLabels:
p4Labels = getP4Labels(self.depotPaths)