git-p4: document and test submit options
Clarify there is a -M option, but no -C. These are both configurable through variables. Explain that the allowSubmit variable takes a comma-separated list of branch names. Catch earlier an invalid branch name given as an argument to "git p4 clone". Test option --origin, variable allowSubmit, and explicit master branch name. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
09fca77b9e
commit
28755dbaa5
@ -362,6 +362,11 @@ def isValidGitDir(path):
|
||||
def parseRevision(ref):
|
||||
return read_pipe("git rev-parse %s" % ref).strip()
|
||||
|
||||
def branchExists(ref):
|
||||
rev = read_pipe(["git", "rev-parse", "-q", "--verify", ref],
|
||||
ignore_error=True)
|
||||
return len(rev) > 0
|
||||
|
||||
def extractLogMessageFromGitCommit(commit):
|
||||
logMessage = ""
|
||||
|
||||
@ -1089,6 +1094,8 @@ class P4Submit(Command, P4UserMap):
|
||||
die("Detecting current git branch failed!")
|
||||
elif len(args) == 1:
|
||||
self.master = args[0]
|
||||
if not branchExists(self.master):
|
||||
die("Branch %s does not exist" % self.master)
|
||||
else:
|
||||
return False
|
||||
|
||||
|
Reference in New Issue
Block a user