From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Aug 2025 20:46:58 +0000 (-0700)
Subject: Merge branch 'ps/remote-rename-fix'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a85fa8406d6281dfcc3caa1e3d3828a5f73a363;p=thirdparty%2Fgit.git

Merge branch 'ps/remote-rename-fix'

"git remote rename origin upstream" failed to move origin/HEAD to
upstream/HEAD when origin/HEAD is unborn and performed other
renames extremely inefficiently, which has been corrected.

* ps/remote-rename-fix:
  builtin/remote: only iterate through refs that are to be renamed
  builtin/remote: rework how remote refs get renamed
  builtin/remote: determine whether refs need renaming early on
  builtin/remote: fix sign comparison warnings
  refs: simplify logic when migrating reflog entries
  refs: pass refname when invoking reflog entry callback
---

9a85fa8406d6281dfcc3caa1e3d3828a5f73a363
diff --cc builtin/remote.c
index 8961ae6a89,60e67f1b74..8a7ed4299a
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@@ -647,19 -765,18 +765,18 @@@ out
  static int migrate_file(struct remote *remote)
  {
  	struct strbuf buf = STRBUF_INIT;
- 	int i;
  
  	strbuf_addf(&buf, "remote.%s.url", remote->name);
- 	for (i = 0; i < remote->url.nr; i++)
+ 	for (size_t i = 0; i < remote->url.nr; i++)
 -		git_config_set_multivar(buf.buf, remote->url.v[i], "^$", 0);
 +		repo_config_set_multivar(the_repository, buf.buf, remote->url.v[i], "^$", 0);
  	strbuf_reset(&buf);
  	strbuf_addf(&buf, "remote.%s.push", remote->name);
- 	for (i = 0; i < remote->push.nr; i++)
+ 	for (int i = 0; i < remote->push.nr; i++)
 -		git_config_set_multivar(buf.buf, remote->push.items[i].raw, "^$", 0);
 +		repo_config_set_multivar(the_repository, buf.buf, remote->push.items[i].raw, "^$", 0);
  	strbuf_reset(&buf);
  	strbuf_addf(&buf, "remote.%s.fetch", remote->name);
- 	for (i = 0; i < remote->fetch.nr; i++)
+ 	for (int i = 0; i < remote->fetch.nr; i++)
 -		git_config_set_multivar(buf.buf, remote->fetch.items[i].raw, "^$", 0);
 +		repo_config_set_multivar(the_repository, buf.buf, remote->fetch.items[i].raw, "^$", 0);
  #ifndef WITH_BREAKING_CHANGES
  	if (remote->origin == REMOTE_REMOTES)
  		unlink_or_warn(repo_git_path_replace(the_repository, &buf,
@@@ -788,9 -944,8 +944,8 @@@ static int mv(int argc, const char **ar
  	if (oldremote->fetch.nr) {
  		strbuf_reset(&buf);
  		strbuf_addf(&buf, "remote.%s.fetch", rename.new_name);
 -		git_config_set_multivar(buf.buf, NULL, NULL, CONFIG_FLAGS_MULTI_REPLACE);
 +		repo_config_set_multivar(the_repository, buf.buf, NULL, NULL, CONFIG_FLAGS_MULTI_REPLACE);
- 		strbuf_addf(&old_remote_context, ":refs/remotes/%s/", rename.old_name);
- 		for (i = 0; i < oldremote->fetch.nr; i++) {
+ 		for (int i = 0; i < oldremote->fetch.nr; i++) {
  			char *ptr;
  
  			strbuf_reset(&buf2);