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 /builtin/gc.c | |
| parent | c3c8b6910a7cd3d5a25522d3fd6925083048be24 (diff) | |
| parent | 16c4fa26b99e6f6c24dc93575ffa884c13b1fe5f (diff) | |
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 'builtin/gc.c')
| -rw-r--r-- | builtin/gc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/gc.c b/builtin/gc.c index 0edd94a76f..03ae4926b2 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -312,7 +312,8 @@ struct count_reflog_entries_data { size_t limit; }; -static int count_reflog_entries(struct object_id *old_oid, struct object_id *new_oid, +static int count_reflog_entries(const char *refname UNUSED, + struct object_id *old_oid, struct object_id *new_oid, const char *committer, timestamp_t timestamp, int tz, const char *msg, void *cb_data) { |