Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maint
[gitweb.git]
/
git-p4.py
diff --git
a/git-p4.py
b/git-p4.py
index ac6f4c14fba8e459318d9e038327fbb34bea2361..fd5ca524626c40823371422e52a3457fd1d45579 100755
(executable)
--- a/
git-p4.py
+++ b/
git-p4.py
@@
-1934,7
+1934,7
@@
def run(self, args):
if self.useClientSpec:
self.clientSpecDirs = getClientSpec()
- # Check for the exist
a
nce of P4 branches
+ # Check for the exist
e
nce of P4 branches
branchesDetected = (len(p4BranchesInGit().keys()) > 1)
if self.useClientSpec and not branchesDetected: