From: Tommy Thorn <tt1729@yahoo.com>
Date: Sat, 2 Feb 2008 08:11:44 +0000 (-0800)
Subject: git-p4: Fix an obvious typo
X-Git-Tag: v1.5.5-rc0~262
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=147402a2e9e29efe3fe75b5409cc2dd88cef04c7;p=git.git

git-p4: Fix an obvious typo

The regexp "$," can't match anything. Clearly not intended.

This was introduced in ce6f33c8 which is quite a while ago.

Signed-off-by: Tommy Thorn <tommy-git@thorn.ws>
Acked-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index e5fe5f6d3..c17afae94 100755
--- 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]