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

From: Simon Hausmann <simon@lst.de>
Date: Feb 3, 2008, 18:36 UTC
Message-ID: <200802031936.02828.simon@lst.de>
In-Reply-To: <182304.89601.qm@web39507.mail.mud.yahoo.com>

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]