diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-09-24 17:30:47 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-09-24 17:30:47 (GMT) |
commit | ae109a9789da452192588b517f893f6bda6383e6 (patch) | |
tree | fa0bfe3be065bcf20fe1671effadc57ba0aab23e | |
parent | 48a81ed29795da3e4cc40d4e5ea535878e4f2d9f (diff) | |
parent | c3b9bc94b9bee431323856fe2c373312c60969d7 (diff) | |
download | git-ae109a9789da452192588b517f893f6bda6383e6.zip git-ae109a9789da452192588b517f893f6bda6383e6.tar.gz git-ae109a9789da452192588b517f893f6bda6383e6.tar.bz2 |
Merge branch 'en/double-semicolon-fix'
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 a3bb13a..4d30001 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -466,7 +466,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 45a163c..fa87341 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -2240,7 +2240,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 fb28309..762a55a 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 */; |