diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-08-07 08:25:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-07 08:25:57 -0700 |
| commit | 227d2faf29d45dde49d807d4d03ce2335caae558 (patch) | |
| tree | e8f9582bc9b95bff2efba37569c515ba1fa5d9bd /commit.c | |
| parent | Merge branch 'ps/reflog-migrate-fixes' into next (diff) | |
| parent | builtin/remote: only iterate through refs that are to be renamed (diff) | |
| download | git-227d2faf29d45dde49d807d4d03ce2335caae558.tar.gz git-227d2faf29d45dde49d807d4d03ce2335caae558.zip | |
Merge branch 'ps/remote-rename-fix' into next
"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 'commit.c')
| -rw-r--r-- | commit.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1039,7 +1039,8 @@ static void add_one_commit(struct object_id *oid, struct rev_collect *revs) commit->object.flags |= TMP_MARK; } -static int collect_one_reflog_ent(struct object_id *ooid, struct object_id *noid, +static int collect_one_reflog_ent(const char *refname UNUSED, + struct object_id *ooid, struct object_id *noid, const char *ident UNUSED, timestamp_t timestamp UNUSED, int tz UNUSED, const char *message UNUSED, void *cbdata) |