summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2013-01-14 19:47:08 -0500
committerJunio C Hamano <gitster@pobox.com>2013-01-15 09:46:30 -0800
commit44e8d26cf3fbc0795fb1c44f54f458847313d35e (patch)
tree1153c0cdd67ff3773642d01d9cc04db814fd4180 /git-p4.py
parentaf8c0092503f677afc9ea4070ebd9204133b83ab (diff)
downloadgit-44e8d26cf3fbc0795fb1c44f54f458847313d35e.tar.gz
git p4: fix submit when no master branch
It finds its upstream and applies the commit properly, but the sync step will fail unless it is told which branch to work on. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-p4.py b/git-p4.py
index 9ea1905dbe..253ad06cc2 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -921,7 +921,8 @@ class P4Submit(Command, P4UserMap):
optparse.make_option("--dry-run", "-n", dest="dry_run", action="store_true"),
optparse.make_option("--prepare-p4-only", dest="prepare_p4_only", action="store_true"),
optparse.make_option("--conflict", dest="conflict_behavior",
- choices=self.conflict_behavior_choices)
+ choices=self.conflict_behavior_choices),
+ optparse.make_option("--branch", dest="branch"),
]
self.description = "Submit changes from git to the perforce depot."
self.usage += " [name of git branch to submit into perforce depot]"
@@ -934,6 +935,7 @@ class P4Submit(Command, P4UserMap):
self.isWindows = (platform.system() == "Windows")
self.exportLabels = False
self.p4HasMoveCommand = p4_has_move_command()
+ self.branch = None
def check(self):
if len(p4CmdList("opened ...")) > 0:
@@ -1670,6 +1672,8 @@ class P4Submit(Command, P4UserMap):
print "All commits applied!"
sync = P4Sync()
+ if self.branch:
+ sync.branch = self.branch
sync.run([])
rebase = P4Rebase()