diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-08-21 13:46:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-21 13:46:58 -0700 |
| commit | 9a85fa8406d6281dfcc3caa1e3d3828a5f73a363 (patch) | |
| tree | a56e9b1c13f83c3d45936cf89b9a9c499d862d66 /object-name.c | |
| parent | Merge branch 'ps/reflog-migrate-fixes' (diff) | |
| parent | builtin/remote: only iterate through refs that are to be renamed (diff) | |
| download | git-9a85fa8406d6281dfcc3caa1e3d3828a5f73a363.tar.gz git-9a85fa8406d6281dfcc3caa1e3d3828a5f73a363.zip | |
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
Diffstat (limited to 'object-name.c')
| -rw-r--r-- | object-name.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/object-name.c b/object-name.c index 11aa0e6afc..732056ff5e 100644 --- a/object-name.c +++ b/object-name.c @@ -1525,7 +1525,8 @@ struct grab_nth_branch_switch_cbdata { struct strbuf *sb; }; -static int grab_nth_branch_switch(struct object_id *ooid UNUSED, +static int grab_nth_branch_switch(const char *refname UNUSED, + struct object_id *ooid UNUSED, struct object_id *noid UNUSED, const char *email UNUSED, timestamp_t timestamp UNUSED, |