Code

git-p4: Fix an obvious typo
authorTommy Thorn <tt1729@yahoo.com>
Sat, 2 Feb 2008 08:11:44 +0000 (00:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Feb 2008 21:00:15 +0000 (13:00 -0800)
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>
contrib/fast-import/git-p4

index e5fe5f6d3d5746111cfc19b4cb8787e9518ff013..c17afae94aa4dc0d3c8c38517a52ae91c231deaf 100755 (executable)
@@ -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]