A remote may be configured to fetch into tracking branches that
don't match its name. A user may have created a remote by hand
that will fetch to a different tracking branch namespace:
[remote "alt"]
url = git://repo.or.cz/alt-git.git
fetch = refs/heads/*:refs/remotes/origin/*
When deleting remote alt we should clean up the refs whose names
start with "refs/remotes/origin/", even though the remote itself
was named alt by the user.
Signed-off-by: Shawn O. Pearce <spearce@xxxxxxxxxxx>
---
I'm not sure this is the right thing to do here. If another
remote is still using these tracking refs (such as the example
in my prior patch of this series) we may not want to remove these
when we remove the remote.
builtin-remote.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/builtin-remote.c b/builtin-remote.c
index e5cfc88..6dbc3d4 100644
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -268,7 +268,7 @@ static int get_ref_states(const struct ref *ref, struct ref_states *states)
}
struct branches_for_remote {
- const char *prefix;
+ struct remote *remote;
struct path_list *branches;
};
@@ -276,8 +276,11 @@ static int add_branch_for_removal(const char *refname,
const unsigned char *sha1, int flags, void *cb_data)
{
struct branches_for_remote *branches = cb_data;
+ struct refspec refspec;
- if (!prefixcmp(refname, branches->prefix)) {
+ memset(&refspec, 0, sizeof(refspec));
+ refspec.dst = (char *)refname;
+ if (!remote_find_tracking(branches->remote, &refspec)) {
struct path_list_item *item;
/* make sure that symrefs are deleted */
@@ -352,9 +355,7 @@ static int rm(int argc, const char **argv)
* the branches one by one, since for_each_ref() relies on cached
* refs, which are invalidated when deleting a branch.
*/
- strbuf_reset(&buf);
- strbuf_addf(&buf, "refs/remotes/%s/", remote->name);
- cb_data.prefix = buf.buf;
+ cb_data.remote = remote;
i = for_each_ref(add_branch_for_removal, &cb_data);
strbuf_release(&buf);
--
1.5.6.rc0.158.g7c7a1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
