diff options
| -rw-r--r-- | builtin/remote.c | 8 | ||||
| -rw-r--r-- | refs.c | 10 | ||||
| -rw-r--r-- | refs.h | 4 |
3 files changed, 6 insertions, 16 deletions
diff --git a/builtin/remote.c b/builtin/remote.c index ace390c671..0fddaa1773 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -912,6 +912,9 @@ static int mv(int argc, const char **argv, const char *prefix, old_remote_context.buf); if (refspecs_need_update) { + struct refs_for_each_ref_options opts = { + .flags = REFS_FOR_EACH_INCLUDE_BROKEN, + }; rename.transaction = ref_store_transaction_begin(get_main_ref_store(the_repository), 0, &err); if (!rename.transaction) @@ -923,9 +926,10 @@ static int mv(int argc, const char **argv, const char *prefix, strbuf_reset(&buf); strbuf_addf(&buf, "refs/remotes/%s/", rename.old_name); + opts.prefix = buf.buf; - result = refs_for_each_rawref_in(get_main_ref_store(the_repository), buf.buf, - rename_one_ref, &rename); + result = refs_for_each_ref_ext(get_main_ref_store(the_repository), + rename_one_ref, &rename, &opts); if (result < 0) die(_("queueing remote ref renames failed: %s"), rename.err->buf); @@ -1982,16 +1982,6 @@ int refs_for_each_namespaced_ref(struct ref_store *refs, return refs_for_each_ref_ext(refs, cb, cb_data, &opts); } -int refs_for_each_rawref_in(struct ref_store *refs, const char *prefix, - refs_for_each_cb cb, void *cb_data) -{ - struct refs_for_each_ref_options opts = { - .prefix = prefix, - .flags = REFS_FOR_EACH_INCLUDE_BROKEN, - }; - return refs_for_each_ref_ext(refs, cb, cb_data, &opts); -} - static int qsort_strcmp(const void *va, const void *vb) { const char *a = *(const char **)va; @@ -542,10 +542,6 @@ int refs_for_each_namespaced_ref(struct ref_store *refs, const char **exclude_patterns, refs_for_each_cb fn, void *cb_data); -/* can be used to learn about broken ref and symref */ -int refs_for_each_rawref_in(struct ref_store *refs, const char *prefix, - refs_for_each_cb fn, void *cb_data); - /* * Normalizes partial refs to their fully qualified form. * Will prepend <prefix> to the <pattern> if it doesn't start with 'refs/'. |