Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index c17afae94aa4dc0d3c8c38517a52ae91c231deaf..781a0cbbbc96d7bf5c6d77518f2d6c9d043ba68b 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1646,7 +1646,7 @@ class P4Clone(P4Sync):
         depotPath = args[0]
         depotDir = re.sub("(@[^@]*)$", "", depotPath)
         depotDir = re.sub("(#[^#]*)$", "", depotDir)
-       depotDir = re.sub(r"\.\.\.$", "", depotDir)
+        depotDir = re.sub(r"\.\.\.$", "", depotDir)
         depotDir = re.sub(r"/$", "", depotDir)
         return os.path.split(depotDir)[1]