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>
Simon Hausmann committed
Mar 26, 2007 at 00:13 UTC
e20a9e530a02fefaec31b484bd224784b8814554
1 file changed
+10
-6
contrib/fast-import/git-p4
+10
-6
@@ -1018,14 +1018,18 @@ except KeyError:
1018
1019
options = cmd.options
1020
cmd.gitdir = gitdir
1021
-options.append(optparse.make_option("--git-dir", dest="gitdir"))
1021
1023
-parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
1024
- options,
1025
- description = cmd.description,
1026
- formatter = HelpFormatter())
1022
+args = sys.argv[2:]
1023
1028
-(cmd, args) = parser.parse_args(sys.argv[2:], cmd);
1024
+if len(options) > 0:
1025
+ options.append(optparse.make_option("--git-dir", dest="gitdir"))
1026
+
1027
+ parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName),
1028
+ options,
1029
+ description = cmd.description,
1030
+ formatter = HelpFormatter())
1031
+
1032
+ (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
1033
1034
gitdir = cmd.gitdir
1035
if len(gitdir) == 0: