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/stash.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 'builtin/stash.c')
| -rw-r--r-- | builtin/stash.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/stash.c b/builtin/stash.c index 1977e50df2..f5ddee5c7f 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -738,7 +738,8 @@ cleanup: return ret; } -static int reject_reflog_ent(struct object_id *ooid UNUSED, +static int reject_reflog_ent(const char *refname UNUSED, + struct object_id *ooid UNUSED, struct object_id *noid UNUSED, const char *email UNUSED, timestamp_t timestamp UNUSED, @@ -2207,7 +2208,8 @@ struct stash_entry_data { size_t count; }; -static int collect_stash_entries(struct object_id *old_oid UNUSED, +static int collect_stash_entries(const char *refname UNUSED, + struct object_id *old_oid UNUSED, struct object_id *new_oid, const char *committer UNUSED, timestamp_t timestamp UNUSED, |