Merge branch 'maint'

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index d8de9f6c255ca7e458eac62e7f14b3d664054587..87ca51e401cc7f00a2e75acdc205fc49ee54231b 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -687,6 +687,10 @@ class P4Submit(Command):
         else:
             return False
 
+        allowSubmit = gitConfig("git-p4.allowSubmit")
+        if len(allowSubmit) > 0 and not self.master in allowSubmit.split(","):
+            die("%s is not in git-p4.allowSubmit" % self.master)
+
         [upstream, settings] = findUpstreamBranchPoint()
         self.depotPath = settings['depot-paths'][0]
         if len(self.origin) == 0: