aboutsummaryrefslogtreecommitdiff
path: root/builtin/stash.c
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2025-07-31 16:56:49 +0200
committerJunio C Hamano <gitster@pobox.com>2025-08-06 14:19:30 -0700
commitb9fd73a234db1a272f6cbfb528bae0ead9e07bde (patch)
tree1b829bc49560ced6b930c4a5519761b368176b96 /builtin/stash.c
parentcf03815537033990b5691b47797968080f9ba3ab (diff)
downloadgit-b9fd73a234db1a272f6cbfb528bae0ead9e07bde.tar.xz
refs: pass refname when invoking reflog entry callback
With `refs_for_each_reflog_ent()` callers can iterate through all the reflog entries for a given reference. The callback that is being invoked for each such entry does not receive the name of the reference that we are currently iterating through. This isn't really a limiting factor, as callers can simply pass the name via the callback data. But this layout sometimes does make for a bit of an awkward calling pattern. One example: when iterating through all reflogs, and for each reflog we iterate through all refnames, we have to do some extra book keeping to track which reference name we are currently yielding reflog entries for. Change the signature of the callback function so that the reference name of the reflog gets passed through to it. Adapt callers accordingly and start using the new parameter in trivial cases. The next commit will refactor the reference migration logic to make use of this parameter so that we can simplify its logic a bit. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/stash.c')
-rw-r--r--builtin/stash.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/stash.c b/builtin/stash.c
index e2f95cc2eb..a1ed67661e 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,
@@ -2173,7 +2174,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,