aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJing Xue <jingxue@digizenstudio.com>2008-06-22 14:12:39 -0400
committerJunio C Hamano <gitster@pobox.com>2008-06-26 12:10:42 -0700
commit4c2d5d722c4775c1efd5e63f41ba5b303ec8fb65 (patch)
treec0135ff70356c66ca66acd11062d7454b7c67206 /contrib
parentde8d95703417a93bb6231f823bb82746f01e8a58 (diff)
downloadgit-4c2d5d722c4775c1efd5e63f41ba5b303ec8fb65.tar.gz
git-4c2d5d722c4775c1efd5e63f41ba5b303ec8fb65.tar.xz
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>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/fast-import/git-p44
1 files changed, 4 insertions, 0 deletions
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: