threads / patch / 11831

patchgit-p4: Fix an obvious typo

Subject: [PATCH] git-p4: Fix an obvious typo

## tl;dr

2 messages between Feb 2, 2008 and Feb 3, 2008. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Tommy Thorn· Feb 2, 2008, 08:11 UTC · lore

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>
---
 contrib/fast-import/git-p4 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to contrib/fast-import/git-p4 +1 −1

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index c80a6da..553e237 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1670,7 +1670,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]

-- 
1.5.4.rc5.5.gab98





      ____________________________________________________________________________________
Never miss a thing.  Make Yahoo your home page. 
http://www.yahoo.com/r/hs

Simon Hausmann· Feb 3, 2008, 18:36 UTC · re: Tommy Thorn · lore

Re: [PATCH] git-p4: Fix an obvious typo

On Saturday 02 February 2008 09:11:44 Tommy Thorn wrote:

Show 5 quoted lines

> 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>

Simon

Show 16 quoted lines

> ---
>  contrib/fast-import/git-p4 |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
> index c80a6da..553e237 100755
> --- a/contrib/fast-import/git-p4
> +++ b/contrib/fast-import/git-p4
> @@ -1670,7 +1670,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]