aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/fast-import
diff options
context:
space:
mode:
authorTommy Thorn <tt1729@yahoo.com>2008-02-02 00:11:44 -0800
committerJunio C Hamano <gitster@pobox.com>2008-02-03 13:00:15 -0800
commit147402a2e9e29efe3fe75b5409cc2dd88cef04c7 (patch)
treec76e9b18e7db0a021acda71ec921a670caf1076e /contrib/fast-import
parent94bc914c5e1e46160f79e743ec369e483bf9f5cd (diff)
downloadgit-147402a2e9e29efe3fe75b5409cc2dd88cef04c7.tar.gz
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>
Diffstat (limited to 'contrib/fast-import')
-rwxr-xr-xcontrib/fast-import/git-p42
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index e5fe5f6d3d..c17afae94a 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]