diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:57:54 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:57:55 +0300 |
| commit | ab6409c66ddad8ee69771bb6e4978950d066523c (patch) | |
| tree | 7b8e805d813f945cca078f0044507ae082b59b64 | |
| parent | 761868b693e2c034148c32bb7fba182a0b381d44 (diff) | |
| parent | c3b9bc94b9bee431323856fe2c373312c60969d7 (diff) | |
Merge branch 'en/double-semicolon-fix' into maint
Code clean-up.
* en/double-semicolon-fix:
Remove superfluous trailing semicolons
| -rw-r--r-- | builtin/receive-pack.c | 2 | ||||
| -rw-r--r-- | merge-recursive.c | 2 | ||||
| -rw-r--r-- | remote-curl.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 1e9d0dfb6d..6c047b5e28 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 */; |