* [PATCH] merge-recursive: remove superfluous semicolon
@ 2018-09-05 16:47 Elijah Newren
2018-09-05 16:54 ` Duy Nguyen
0 siblings, 1 reply; 3+ messages in thread
From: Elijah Newren @ 2018-09-05 16:47 UTC (permalink / raw)
To: git; +Cc: Elijah Newren
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... My bad for not noticing it when reviewing the original patch
that introduced it, I guess -- 9da2d0379ea0 ("merge-recursive: use
xstrdup() instead of fixed buffer", 2018-06-10)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] merge-recursive: remove superfluous semicolon 2018-09-05 16:47 [PATCH] merge-recursive: remove superfluous semicolon Elijah Newren @ 2018-09-05 16:54 ` Duy Nguyen 2018-09-05 17:03 ` Elijah Newren 0 siblings, 1 reply; 3+ messages in thread From: Duy Nguyen @ 2018-09-05 16:54 UTC (permalink / raw) To: Elijah Newren; +Cc: Git Mailing List On Wed, Sep 5, 2018 at 6:49 PM Elijah Newren <newren@gmail.com> wrote: > > 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);; > > 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 ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] merge-recursive: remove superfluous semicolon 2018-09-05 16:54 ` Duy Nguyen @ 2018-09-05 17:03 ` Elijah Newren 0 siblings, 0 replies; 3+ messages in thread From: Elijah Newren @ 2018-09-05 17:03 UTC (permalink / raw) To: git; +Cc: Elijah Newren On Wed, Sep 5, 2018 at 9:55 AM Duy Nguyen <pclouds@gmail.com> wrote: > > On Wed, Sep 5, 2018 at 6:49 PM Elijah Newren <newren@gmail.com> wrote: > > > > 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);; Whoops, indeed. I didn't think about the fact that the same problem might appear in some other file. Anyway, here's the extended fix. -- 8< -- Subject: [PATCH] Remove superfluous trailing semicolons Signed-off-by: Elijah Newren <newren@gmail.com> --- builtin/receive-pack.c | 2 +- merge-recursive.c | 2 +- remote-curl.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index c17ce94e12..a8423a940f 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -465,7 +465,7 @@ static char *prepare_push_cert_nonce(const char *path, timestamp_t stamp) unsigned char sha1[GIT_SHA1_RAWSZ]; strbuf_addf(&buf, "%s:%"PRItime, path, stamp); - hmac_sha1(sha1, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed));; + hmac_sha1(sha1, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed)); strbuf_release(&buf); /* RFC 2104 5. HMAC-SHA1-80 */ 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'; diff --git a/remote-curl.c b/remote-curl.c index fb28309e85..762a55a75f 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -178,7 +178,7 @@ static int set_option(const char *name, const char *value) options.no_dependents = 1; return 0; } else if (!strcmp(name, "filter")) { - options.filter = xstrdup(value);; + options.filter = xstrdup(value); return 0; } else { return 1 /* unsupported */; -- 2.19.0.rc2.2.g1aedc61e22 ^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-09-05 17:03 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-09-05 16:47 [PATCH] merge-recursive: remove superfluous semicolon Elijah Newren 2018-09-05 16:54 ` Duy Nguyen 2018-09-05 17:03 ` Elijah Newren
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).