Don't try to parse any options with git-p4 debug but pass it straight on to p4
Signed-off-by: Simon Hausmann <simon@lst.de>
This commit is contained in:
parent
9863f4055e
commit
e20a9e530a
@ -1018,14 +1018,18 @@ except KeyError:
|
|||||||
|
|
||||||
options = cmd.options
|
options = cmd.options
|
||||||
cmd.gitdir = gitdir
|
cmd.gitdir = gitdir
|
||||||
options.append(optparse.make_option("--git-dir", dest="gitdir"))
|
|
||||||
|
|
||||||
parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
|
args = sys.argv[2:]
|
||||||
options,
|
|
||||||
description = cmd.description,
|
|
||||||
formatter = HelpFormatter())
|
|
||||||
|
|
||||||
(cmd, args) = parser.parse_args(sys.argv[2:], cmd);
|
if len(options) > 0:
|
||||||
|
options.append(optparse.make_option("--git-dir", dest="gitdir"))
|
||||||
|
|
||||||
|
parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
|
||||||
|
options,
|
||||||
|
description = cmd.description,
|
||||||
|
formatter = HelpFormatter())
|
||||||
|
|
||||||
|
(cmd, args) = parser.parse_args(sys.argv[2:], cmd);
|
||||||
|
|
||||||
gitdir = cmd.gitdir
|
gitdir = cmd.gitdir
|
||||||
if len(gitdir) == 0:
|
if len(gitdir) == 0:
|
||||||
|
Loading…
Reference in New Issue
Block a user