{"thread":{"id":"49282","subject":"[PATCH] merge-recursive: remove superfluous semicolon","startedAt":"2018-09-05T16:47:58Z","lastAt":"2018-09-05T17:03:15Z","messageCount":3,"participants":["Elijah Newren","Duy Nguyen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"357444","messageId":"20180905164753.22711-1-newren@gmail.com","threadId":"49282","inReplyTo":null,"subject":"[PATCH] merge-recursive: remove superfluous semicolon","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2018-09-05T16:47:53Z","receivedAt":"2018-09-05T16:47:58Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"Signed-off-by: Elijah Newren \n---\nOnce I saw it, I couldn't unsee it, and it quickly started getting on my\nnerves... My bad for not noticing it when reviewing the original patch\nthat introduced it, I guess -- 9da2d0379ea0 (\"merge-recursive: use\nxstrdup() instead of fixed buffer\", 2018-06-10)\n\n merge-recursive.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex e5243dbc54..1b5c255918 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -2239,7 +2239,7 @@ static struct dir_rename_entry *check_dir_renamed(const char *path,\n {\n \tchar *temp = xstrdup(path);\n \tchar *end;\n-\tstruct dir_rename_entry *entry = NULL;;\n+\tstruct dir_rename_entry *entry = NULL;\n \n \twhile ((end = strrchr(temp, '/'))) {\n \t\t*end = '\\0';\n-- \n2.19.0.rc2.1.g7fc77f67e1\n\n"},{"id":"357447","messageId":"CACsJy8Cf5+3+6yDwe4Y4wYLze4Y6naW-pj134KTpXM+wyWbFVQ@mail.gmail.com","threadId":"49282","inReplyTo":"20180905164753.22711-1-newren@gmail.com","subject":"Re: [PATCH] merge-recursive: remove superfluous semicolon","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2018-09-05T16:54:55Z","receivedAt":"2018-09-05T16:55:23Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Wed, Sep 5, 2018 at 6:49 PM Elijah Newren wrote:\n>\n> Signed-off-by: Elijah Newren \n> ---\n> Once I saw it, I couldn't unsee it, and it quickly started getting on my\n> nerves...\n\nBad Elijah! Should have grepped and fixed all three ;-)\n\n$ git grep ';;$' -- '*.c'\nbuiltin/receive-pack.c: hmac_sha1(sha1, buf.buf, buf.len,\ncert_nonce_seed, strlen(cert_nonce_seed));;\nmerge-recursive.c: struct dir_rename_entry *entry = NULL;;\nremote-curl.c: options.filter = xstrdup(value);;\n\n\n>\n> merge-recursive.c | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/merge-recursive.c b/merge-recursive.c\n> index e5243dbc54..1b5c255918 100644\n> --- a/merge-recursive.c\n> +++ b/merge-recursive.c\n> @@ -2239,7 +2239,7 @@ static struct dir_rename_entry *check_dir_renamed(const char *path,\n> {\n> char *temp = xstrdup(path);\n> char *end;\n> - struct dir_rename_entry *entry = NULL;;\n> + struct dir_rename_entry *entry = NULL;\n>\n> while ((end = strrchr(temp, '/'))) {\n> *end = '\\0';\n> --\n> 2.19.0.rc2.1.g7fc77f67e1\n>\n\n\n-- \nDuy\n"},{"id":"357450","messageId":"20180905170308.32017-1-newren@gmail.com","threadId":"49282","inReplyTo":"CACsJy8Cf5+3+6yDwe4Y4wYLze4Y6naW-pj134KTpXM+wyWbFVQ@mail.gmail.com","subject":"Re: [PATCH] merge-recursive: remove superfluous semicolon","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2018-09-05T17:03:07Z","receivedAt":"2018-09-05T17:03:15Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"On Wed, Sep 5, 2018 at 9:55 AM Duy Nguyen wrote:\n>\n> On Wed, Sep 5, 2018 at 6:49 PM Elijah Newren wrote:\n> >\n> > Signed-off-by: Elijah Newren \n> > ---\n> > Once I saw it, I couldn't unsee it, and it quickly started getting on my\n> > nerves...\n>\n> Bad Elijah! Should have grepped and fixed all three ;-)\n>\n> $ git grep ';;$' -- '*.c'\n> builtin/receive-pack.c: hmac_sha1(sha1, buf.buf, buf.len,\n> cert_nonce_seed, strlen(cert_nonce_seed));;\n> merge-recursive.c: struct dir_rename_entry *entry = NULL;;\n> remote-curl.c: options.filter = xstrdup(value);;\n\nWhoops, indeed. I didn't think about the fact that the same problem\nmight appear in some other file. Anyway, here's the extended fix.\n\n-- 8< --\nSubject: [PATCH] Remove superfluous trailing semicolons\n\nSigned-off-by: Elijah Newren \n---\n builtin/receive-pack.c | 2 +-\n merge-recursive.c | 2 +-\n remote-curl.c | 2 +-\n 3 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin/receive-pack.c b/builtin/receive-pack.c\nindex c17ce94e12..a8423a940f 100644\n--- a/builtin/receive-pack.c\n+++ b/builtin/receive-pack.c\n@@ -465,7 +465,7 @@ static char *prepare_push_cert_nonce(const char *path, timestamp_t stamp)\n \tunsigned char sha1[GIT_SHA1_RAWSZ];\n \n \tstrbuf_addf(&buf, \"%s:%\"PRItime, path, stamp);\n-\thmac_sha1(sha1, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed));;\n+\thmac_sha1(sha1, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed));\n \tstrbuf_release(&buf);\n \n \t/* RFC 2104 5. HMAC-SHA1-80 */\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex e5243dbc54..1b5c255918 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -2239,7 +2239,7 @@ static struct dir_rename_entry *check_dir_renamed(const char *path,\n {\n \tchar *temp = xstrdup(path);\n \tchar *end;\n-\tstruct dir_rename_entry *entry = NULL;;\n+\tstruct dir_rename_entry *entry = NULL;\n \n \twhile ((end = strrchr(temp, '/'))) {\n \t\t*end = '\\0';\ndiff --git a/remote-curl.c b/remote-curl.c\nindex fb28309e85..762a55a75f 100644\n--- a/remote-curl.c\n+++ b/remote-curl.c\n@@ -178,7 +178,7 @@ static int set_option(const char *name, const char *value)\n \t\toptions.no_dependents = 1;\n \t\treturn 0;\n \t} else if (!strcmp(name, \"filter\")) {\n-\t\toptions.filter = xstrdup(value);;\n+\t\toptions.filter = xstrdup(value);\n \t\treturn 0;\n \t} else {\n \t\treturn 1 /* unsupported */;\n-- \n2.19.0.rc2.2.g1aedc61e22\n\n"}]}