From: Stefan Beller <sbeller@google.com>
To: pclouds@gmail.com
Cc: bmwill@google.com, git@vger.kernel.org, mhagger@alum.mit.edu,
sbeller@google.com, stolee@gmail.com, dstolee@microsoft.com
Subject: [PATCH 2/2] refs: switch for_each_replace_ref back to use a ref_store
Date: Mon, 30 Jul 2018 12:47:31 -0700 [thread overview]
Message-ID: <20180730194731.220191-3-sbeller@google.com> (raw)
In-Reply-To: <20180730194731.220191-1-sbeller@google.com>
This effectively reverts commit 0d296c57ae (refs: allow for_each_replace_ref
to handle arbitrary repositories, 2018-04-11) and 60ce76d3581 (refs: add
repository argument to for_each_replace_ref, 2018-04-11).
The repository argument is not any special from the ref-store's point
of life. If you need a repository (for e.g. lookup_commit or friends),
you'll have to pass it through the callback cookie, whether directly or
as part of a struct tailored to your purpose.
So let's go back to the clean API, just requiring a ref_store as an
argument.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
builtin/replace.c | 2 +-
refs.c | 4 ++--
refs.h | 2 +-
replace-object.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/replace.c b/builtin/replace.c
index deabda21012..52dc371eafc 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -87,7 +87,7 @@ static int list_replace_refs(const char *pattern, const char *format)
"valid formats are 'short', 'medium' and 'long'\n",
format);
- for_each_replace_ref(the_repository, show_reference, (void *)&data);
+ for_each_replace_ref(show_reference, (void *)&data);
return 0;
}
diff --git a/refs.c b/refs.c
index 08fb5a99148..2d713499125 100644
--- a/refs.c
+++ b/refs.c
@@ -1441,9 +1441,9 @@ int refs_for_each_fullref_in(struct ref_store *refs, const char *prefix,
return do_for_each_ref(refs, prefix, fn, 0, flag, cb_data);
}
-int for_each_replace_ref(struct repository *r, each_ref_fn fn, void *cb_data)
+int for_each_replace_ref(each_ref_fn fn, void *cb_data)
{
- return do_for_each_ref(get_main_ref_store(r),
+ return do_for_each_ref(get_main_ref_store(the_repository),
git_replace_ref_base, fn,
strlen(git_replace_ref_base),
DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
diff --git a/refs.h b/refs.h
index cc2fb4c68c0..48d5ffd2082 100644
--- a/refs.h
+++ b/refs.h
@@ -307,7 +307,7 @@ int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data,
int for_each_tag_ref(each_ref_fn fn, void *cb_data);
int for_each_branch_ref(each_ref_fn fn, void *cb_data);
int for_each_remote_ref(each_ref_fn fn, void *cb_data);
-int for_each_replace_ref(struct repository *r, each_ref_fn fn, void *cb_data);
+int for_each_replace_ref(each_ref_fn fn, void *cb_data);
int for_each_glob_ref(each_ref_fn fn, const char *pattern, void *cb_data);
int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
const char *prefix, void *cb_data);
diff --git a/replace-object.c b/replace-object.c
index e99fcd1ff6e..ee3374ab59b 100644
--- a/replace-object.c
+++ b/replace-object.c
@@ -41,7 +41,7 @@ static void prepare_replace_object(struct repository *r)
xmalloc(sizeof(*r->objects->replace_map));
oidmap_init(r->objects->replace_map, 0);
- for_each_replace_ref(r, register_replace_ref, r);
+ for_each_replace_ref(register_replace_ref, r);
}
/* We allow "recursive" replacement. Only within reason, though */
--
2.18.0.132.g195c49a2227
next prev parent reply other threads:[~2018-07-30 19:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-27 0:36 [RFC PATCH 0/3] Migrate the refs API to take the repository argument Stefan Beller
2018-07-27 0:36 ` [PATCH 1/3] refs.c: migrate internal ref iteration to pass thru " Stefan Beller
2018-07-27 0:36 ` [PATCH 2/3] refs: introduce new API, wrap old API shallowly around new API Stefan Beller
2018-07-27 16:07 ` Duy Nguyen
2018-07-27 17:19 ` Brandon Williams
2018-07-27 17:30 ` Stefan Beller
2018-07-27 18:04 ` Duy Nguyen
2018-07-30 19:47 ` [PATCH 0/2] Cleanup refs API [WAS: Re: [PATCH 2/3] refs: introduce new API, wrap old API shallowly around new API] Stefan Beller
2018-07-30 19:47 ` [PATCH 1/2] replace-objects: use arbitrary repositories Stefan Beller
2018-07-30 19:47 ` Stefan Beller [this message]
2018-07-31 0:18 ` [PATCH 2/2] refs: switch for_each_replace_ref back to use a ref_store Jonathan Tan
2018-07-31 0:41 ` Stefan Beller
2018-07-31 16:17 ` Duy Nguyen
2018-07-27 0:36 ` [PATCH 3/3] replace: migrate to for_each_replace_repo_ref Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180730194731.220191-3-sbeller@google.com \
--to=sbeller@google.com \
--cc=bmwill@google.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=pclouds@gmail.com \
--cc=stolee@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).