Browse Source

Adjust the output parsing of git name-rev to handle the output of the latest git version.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
maint
Simon Hausmann 18 years ago
parent
commit
6392a40e5e
  1. 5
      contrib/fast-import/p4-clean-tags.py

5
contrib/fast-import/p4-clean-tags.py

@ -25,7 +25,10 @@ for o, a in opts: @@ -25,7 +25,10 @@ for o, a in opts:
sout, sin, serr = popen2.popen3("git-name-rev --tags `git-rev-parse %s`" % branch)
output = sout.read()
tagIdx = output.index(" tags/p4/")
caretIdx = output.index("^")
try:
caretIdx = output.index("^")
except:
caretIdx = len(output) - 1
rev = int(output[tagIdx + 9 : caretIdx])

allTags = os.popen("git tag -l p4/").readlines()

Loading…
Cancel
Save