summaryrefslogtreecommitdiff
path: root/contrib/fast-import
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/fast-import')
-rwxr-xr-xcontrib/fast-import/p4-clean-tags.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/fast-import/p4-clean-tags.py b/contrib/fast-import/p4-clean-tags.py
index 0be51f6405..924ff89cc6 100755
--- a/contrib/fast-import/p4-clean-tags.py
+++ b/contrib/fast-import/p4-clean-tags.py
@@ -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()