Re: [PATCH] merge-recursive: remove superfluous semicolon

From: Duy Nguyen <pclouds@gmail.com>
Date: Sep 5, 2018, 16:54 UTC
Message-ID: <CACsJy8Cf5+3+6yDwe4Y4wYLze4Y6naW-pj134KTpXM+wyWbFVQ@mail.gmail.com>
In-Reply-To: <20180905164753.22711-1-newren@gmail.com>

On Wed, Sep 5, 2018 at 6:49 PM Elijah Newren <newren@gmail.com> wrote:

Show 5 quoted lines

>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
> Once I saw it, I couldn't unsee it, and it quickly started getting on my
> nerves...

Bad Elijah! Should have grepped and fixed all three ;-)

$ git grep ';;$' -- '*.c' builtin/receive-pack.c: hmac_sha1(sha1, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed));; merge-recursive.c: struct dir_rename_entry *entry = NULL;; remote-curl.c: options.filter = xstrdup(value);;

Show 20 quoted lines

>
>  merge-recursive.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/merge-recursive.c b/merge-recursive.c
> index e5243dbc54..1b5c255918 100644
> --- a/merge-recursive.c
> +++ b/merge-recursive.c
> @@ -2239,7 +2239,7 @@ static struct dir_rename_entry *check_dir_renamed(const char *path,
>  {
>         char *temp = xstrdup(path);
>         char *end;
> -       struct dir_rename_entry *entry = NULL;;
> +       struct dir_rename_entry *entry = NULL;
>
>         while ((end = strrchr(temp, '/'))) {
>                 *end = '\0';
> --
> 2.19.0.rc2.1.g7fc77f67e1
>

-- 
Duy