diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-05-07 09:11:53 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-07 10:06:59 -0700 |
| commit | 2e5c4758b75f7cbae612c89b177aa045fa4f9c68 (patch) | |
| tree | 4836d2b3c740848d105355f0c6150f32acdcd0de /fmt-merge-msg.c | |
| parent | cocci: introduce rules to transform "refs" to pass ref store (diff) | |
| download | git-2e5c4758b75f7cbae612c89b177aa045fa4f9c68.tar.gz git-2e5c4758b75f7cbae612c89b177aa045fa4f9c68.zip | |
cocci: apply rules to rewrite callers of "refs" interfaces
Apply the rules that rewrite callers of "refs" interfaces to explicitly
pass `struct ref_store`. The resulting patch has been applied with the
`--whitespace=fix` option.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fmt-merge-msg.c')
| -rw-r--r-- | fmt-merge-msg.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c index ae201e21db..7d144b803a 100644 --- a/fmt-merge-msg.c +++ b/fmt-merge-msg.c @@ -661,7 +661,9 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out, /* learn the commit that we merge into and the current branch name */ current_branch = current_branch_to_free = - resolve_refdup("HEAD", RESOLVE_REF_READING, &head_oid, NULL); + refs_resolve_refdup(get_main_ref_store(the_repository), + "HEAD", RESOLVE_REF_READING, &head_oid, + NULL); if (!current_branch) die("No current branch"); |