X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Ffast-import%2Fgit-p4;h=87ca51e401cc7f00a2e75acdc205fc49ee54231b;hb=f7484dbb835871f9526c56eb325011a312df626b;hp=d8de9f6c255ca7e458eac62e7f14b3d664054587;hpb=31c6390d40fe12a46c38d7224da61c6771886f2a;p=git.git diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index d8de9f6c2..87ca51e40 100755 --- 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: