summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Hausmann <simon@lst.de>2008-02-19 08:12:29 (GMT)
committerSimon Hausmann <simon@lst.de>2008-02-27 15:26:57 (GMT)
commit4b61b5c963ad1fd59e858c2bc21b1b48836f04f8 (patch)
tree83b8f654d1856ccccc9a2751a1a95dbd2dea9253
parent354081d5a0392a015731a637f026dc885a4ddb0f (diff)
downloadgit-4b61b5c963ad1fd59e858c2bc21b1b48836f04f8.zip
git-4b61b5c963ad1fd59e858c2bc21b1b48836f04f8.tar.gz
git-4b61b5c963ad1fd59e858c2bc21b1b48836f04f8.tar.bz2
git-p4: Remove --log-substitutions feature.
This turns out to be rarely useful and is already covered by git's commit.template configuration variable. Signed-off-by: Simon Hausmann <simon@lst.de>
-rwxr-xr-xcontrib/fast-import/git-p47
1 files changed, 0 insertions, 7 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index e423853..f2a6059 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -468,7 +468,6 @@ class P4Submit(Command):
optparse.make_option("--verbose", dest="verbose", action="store_true"),
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("--direct", dest="directSubmit", action="store_true"),
optparse.make_option("-M", dest="detectRename", action="store_true"),
]
@@ -477,7 +476,6 @@ class P4Submit(Command):
self.firstTime = True
self.reset = False
self.interactive = True
- self.substFile = ""
self.firstTime = True
self.origin = ""
self.directSubmit = False
@@ -759,11 +757,6 @@ class P4Submit(Command):
if self.reset:
self.firstTime = True
- if len(self.substFile) > 0:
- for line in open(self.substFile, "r").readlines():
- tokens = line.strip().split("=")
- self.logSubstitutions[tokens[0]] = tokens[1]
-
self.check()
self.configFile = self.gitdir + "/p4-git-sync.cfg"
self.config = shelve.open(self.configFile, writeback=True)