summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-03-22 21:00:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-03-22 21:00:23 (GMT)
commit52182e3b1f3e9b840c9297f7aba58ad44bc0b5f2 (patch)
tree1bd10dd2d5720f5febff87b27d809acb53052a67 /builtin
parent2435feaa207eb3256dda978654b2a4308cdbd446 (diff)
parent0f1da600e6864e8b4fe97aea72a3b68c227a709c (diff)
downloadgit-52182e3b1f3e9b840c9297f7aba58ad44bc0b5f2.zip
git-52182e3b1f3e9b840c9297f7aba58ad44bc0b5f2.tar.gz
git-52182e3b1f3e9b840c9297f7aba58ad44bc0b5f2.tar.bz2
Merge branch 'ab/remote-write-config-in-camel-case'
Update C code that sets a few configuration variables when a remote is configured so that it spells configuration variable names in the canonical camelCase. * ab/remote-write-config-in-camel-case: remote: write camel-cased *.pushRemote on rename remote: add camel-cased *.tagOpt key, like clone
Diffstat (limited to 'builtin')
-rw-r--r--builtin/remote.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/remote.c b/builtin/remote.c
index d11a558..717b662 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -221,7 +221,7 @@ static int add(int argc, const char **argv)
if (fetch_tags != TAGS_DEFAULT) {
strbuf_reset(&buf);
- strbuf_addf(&buf, "remote.%s.tagopt", name);
+ strbuf_addf(&buf, "remote.%s.tagOpt", name);
git_config_set(buf.buf,
fetch_tags == TAGS_SET ? "--tags" : "--no-tags");
}
@@ -746,7 +746,7 @@ static int mv(int argc, const char **argv)
}
if (info->push_remote_name && !strcmp(info->push_remote_name, rename.old_name)) {
strbuf_reset(&buf);
- strbuf_addf(&buf, "branch.%s.pushremote", item->string);
+ strbuf_addf(&buf, "branch.%s.pushRemote", item->string);
git_config_set(buf.buf, rename.new_name);
}
}