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>

diff --git a/contrib/fast-import/p4-clean-tags.py b/contrib/fast-import/p4-clean-tags.py
index 0be51f64053ddeea1613ec15813432e7df9d081f..924ff89cc65531540cd49e4e58b9941f2e36cccc 100755 (executable)
--- a/contrib/fast-import/p4-clean-tags.py
+++ b/contrib/fast-import/p4-clean-tags.py
@@ -25,7 +25,10 @@
 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()