Merge branch 'ab/remote-write-config-in-camel-case'

gitster · gitster · commit 52182e3b1f3e · 2021-03-22T14:00:23.000-07:00
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
diff --git 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);
 		}
 	}
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
@@ -594,6 +594,7 @@ test_expect_success 'add --no-tags' '
 		cd add-no-tags &&
 		git init &&
 		git remote add -f --no-tags origin ../one &&
+		grep tagOpt .git/config &&
 		git tag -l some-tag >../test/output &&
 		git tag -l foobar-tag >../test/output &&
 		git config remote.origin.tagopt >>../test/output
@@ -756,6 +757,7 @@ test_expect_success 'rename a remote' '
 		cd four &&
 		git config branch.main.pushRemote origin &&
 		git remote rename origin upstream &&
+		grep "pushRemote" .git/config &&
 		test -z "$(git for-each-ref refs/remotes/origin)" &&
 		test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/main" &&
 		test "$(git rev-parse upstream/main)" = "$(git rev-parse main)" &&
@@ -772,6 +774,7 @@ test_expect_success 'rename a remote renames repo remote.pushDefault' '
 		cd four.1 &&
 		git config remote.pushDefault origin &&
 		git remote rename origin upstream &&
+		grep pushDefault .git/config &&
 		test "$(git config --local remote.pushDefault)" = "upstream"
 	)
 '
diff --git a/t/t5612-clone-refspec.sh b/t/t5612-clone-refspec.sh
@@ -97,6 +97,7 @@ test_expect_success 'by default no tags will be kept updated' '
 test_expect_success 'clone with --no-tags' '
 	(
 		cd dir_all_no_tags &&
+		grep tagOpt .git/config &&
 		git fetch &&
 		git for-each-ref refs/tags >../actual
 	) &&

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ static int add(int argc, const char **argv)`
`221`	`221`
`222`	`222`	`if (fetch_tags != TAGS_DEFAULT) {`
`223`	`223`	`strbuf_reset(&buf);`
`224`		`- strbuf_addf(&buf, "remote.%s.tagopt", name);`
	`224`	`+ strbuf_addf(&buf, "remote.%s.tagOpt", name);`
`225`	`225`	`git_config_set(buf.buf,`
`226`	`226`	`fetch_tags == TAGS_SET ? "--tags" : "--no-tags");`
`227`	`227`	`}`
`@@ -746,7 +746,7 @@ static int mv(int argc, const char **argv)`
`746`	`746`	`}`
`747`	`747`	`if (info->push_remote_name && !strcmp(info->push_remote_name, rename.old_name)) {`
`748`	`748`	`strbuf_reset(&buf);`
`749`		`- strbuf_addf(&buf, "branch.%s.pushremote", item->string);`
	`749`	`+ strbuf_addf(&buf, "branch.%s.pushRemote", item->string);`
`750`	`750`	`git_config_set(buf.buf, rename.new_name);`
`751`	`751`	`}`
`752`	`752`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ test_expect_success 'by default no tags will be kept updated' '`
`97`	`97`	`test_expect_success 'clone with --no-tags' '`
`98`	`98`	`(`
`99`	`99`	`cd dir_all_no_tags &&`
	`100`	`+ grep tagOpt .git/config &&`
`100`	`101`	`git fetch &&`
`101`	`102`	`git for-each-ref refs/tags >../actual`
`102`	`103`	`) &&`