@matheusbsbs / matheus-bagliano / commits / 4c2d5d722c
Fork 0

Add 'git-p4.allowSubmit' to git-p4

I'm working with a perforce repo using git-p4. There are some config files which I need to change locally according to my environment. I'm using a 'local' git branch to park these changes. And I want to avoid accidentally checking them into p4 just by doing "git p4 submit" mindlessly without realizing which branch I'm actually on. This patch adds a new git config, 'git-p4.allowSubmit', which is a whitelist of branch names. "git p4 submit" will only allow submissions from local branches on the list. Useful for preventing inadvertently submitting from a strictly local branch. For backward compatibility, if this config is not set at all, submissions from all branches are allowed. Signed-off-by: Jing Xue <jingxue@digizenstudio.com> Acked-By: Simon Hausmann <simon@lst.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jing Xue committed Jun 22, 2008 at 14:12 UTC 4c2d5d722c4775c1efd5e63f41ba5b303ec8fb65
1 file changed +4
contrib/fast-import/git-p4
+4
@@ -687,6 +687,10 @@ class P4Submit(Command):
687 else:
688 return False
689
690 + allowSubmit = gitConfig("git-p4.allowSubmit")
691 + if len(allowSubmit) > 0 and not self.master in allowSubmit.split(","):
692 + die("%s is not in git-p4.allowSubmit" % self.master)
693 +
694 [upstream, settings] = findUpstreamBranchPoint()
695 self.depotPath = settings['depot-paths'][0]
696 if len(self.origin) == 0: