Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Added git-p4 submit --trust-me-like-a-fool for the adventurous users :)
author
Simon Hausmann
<simon@lst.de>
Fri, 25 May 2007 20:34:30 +0000
(22:34 +0200)
committer
Simon Hausmann
<simon@lst.de>
Fri, 25 May 2007 20:34:30 +0000
(22:34 +0200)
Signed-off-by: Simon Hausmann <simon@lst.de>
contrib/fast-import/git-p4
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
877db58
)
diff --git
a/contrib/fast-import/git-p4
b/contrib/fast-import/git-p4
index 0946965043b45bb92da981d17ebc532a9597aaca..dbd5b3bcf1e3e6db668b04a8aa6eb327a8fc836a 100755
(executable)
--- a/
contrib/fast-import/git-p4
+++ b/
contrib/fast-import/git-p4
@@
-195,9
+195,9
@@
class P4Submit(Command):
optparse.make_option("--origin", dest="origin"),
optparse.make_option("--reset", action="store_true", dest="reset"),
optparse.make_option("--log-substitutions", dest="substFile"),
optparse.make_option("--origin", dest="origin"),
optparse.make_option("--reset", action="store_true", dest="reset"),
optparse.make_option("--log-substitutions", dest="substFile"),
- optparse.make_option("--noninteractive", action="store_false"),
optparse.make_option("--dry-run", action="store_true"),
optparse.make_option("--direct", dest="directSubmit", action="store_true"),
optparse.make_option("--dry-run", action="store_true"),
optparse.make_option("--direct", dest="directSubmit", action="store_true"),
+ optparse.make_option("--trust-me-like-a-fool", dest="trustMeLikeAFool", action="store_true"),
]
self.description = "Submit changes from git to the perforce depot."
self.usage += " [name of git branch to submit into perforce depot]"
]
self.description = "Submit changes from git to the perforce depot."
self.usage += " [name of git branch to submit into perforce depot]"
@@
-209,6
+209,7
@@
class P4Submit(Command):
self.firstTime = True
self.origin = ""
self.directSubmit = False
self.firstTime = True
self.origin = ""
self.directSubmit = False
+ self.trustMeLikeAFool = False
self.logSubstitutions = {}
self.logSubstitutions["<enter description here>"] = "%log%"
self.logSubstitutions = {}
self.logSubstitutions["<enter description here>"] = "%log%"
@@
-348,6
+349,9
@@
class P4Submit(Command):
separatorLine += "\n"
response = "e"
separatorLine += "\n"
response = "e"
+ if self.trustMeLikeAFool:
+ response = "y"
+
firstIteration = True
while response == "e":
if not firstIteration:
firstIteration = True
while response == "e":
if not firstIteration: