[PATCH 2/3] fetch: honor the user-provided refspecs when pruning refs
- From
Carlos Martín Nieto <cmn@elego.de>
- Date
- Oct 6, 2011, 21:21 UTC
- Message-ID
- <1317936107-1230-3-git-send-email-cmn@elego.de>
- In-Reply-To
- <1317936107-1230-1-git-send-email-cmn@elego.de>
If the user gave us refspecs on the command line, we should use those when deciding whether to prune a ref instead of relying on the refspecs in the config.
Previously, running
git fetch --prune origin refs/heads/master:refs/remotes/origin/master
would delete every other tag under the origin namespace because we were using the refspec to filter the available refs but using the configured refspec to figure out if a ref had been deleted on the remote. This is clearly the wrong thing to do.
Teach get_stale_heads about user-provided refspecs and use them if they're available.
Signed-off-by: Carlos Martín Nieto <cmn@elego.de> --- builtin/fetch.c | 6 ++-- builtin/remote.c | 2 +- remote.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++----- remote.h | 3 +- 4 files changed, 77 insertions(+), 12 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c index 30b485e..b937d71 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -505,10 +505,10 @@ static int fetch_refs(struct transport *transport, struct ref *ref_map) return ret; } -static int prune_refs(struct transport *transport, struct ref *ref_map) +static int prune_refs(struct transport *transport, struct refspec *refs, int n, struct ref *ref_map) { int result = 0; - struct ref *ref, *stale_refs = get_stale_heads(transport->remote, ref_map); + struct ref *ref, *stale_refs = get_stale_heads(transport->remote, ref_map, refs, n); const char *dangling_msg = dry_run ? _(" (%s will become dangling)\n") : _(" (%s has become dangling)\n"); @@ -700,7 +700,7 @@ static int do_fetch(struct transport *transport, return 1; } if (prune) - prune_refs(transport, ref_map); + prune_refs(transport, refs, ref_count, ref_map); free_refs(ref_map); /* if neither --no-tags nor --tags was specified, do automated tag diff --git a/builtin/remote.c b/builtin/remote.c index b25dfb4..91a2148 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -349,7 +349,7 @@ static int get_ref_states(const struct ref *remote_refs, struct ref_states *stat else string_list_append(&states->tracked, abbrev_branch(ref->name)); } - stale_refs = get_stale_heads(states->remote, fetch_map); + stale_refs = get_stale_heads(states->remote, fetch_map, NULL, 0); for (ref = stale_refs; ref; ref = ref->next) { struct string_list_item *item = string_list_append(&states->stale, abbrev_branch(ref->name)); diff --git a/remote.c b/remote.c index 7840d2f..28f7917 100644 --- a/remote.c +++ b/remote.c @@ -1684,26 +1684,88 @@ struct stale_heads_info { struct remote *remote; struct string_list *ref_names; struct ref **stale_refs_tail; + struct refspec *refs; + int ref_count; }; +/* + * Find a refspec to a remote's + * Returns 0 on success, -1 if it couldn't find a the refspec + */ +static int find_in_refs(struct refspec *refs, int ref_count, struct refspec *query) +{ + int i; + struct refspec *refspec; + + for (i = 0; i < ref_count; ++i) { + refspec = &refs[i]; + + /* No dst means it can't be used for prunning. */ + if (!refspec->dst) + continue; + + /* + * No '*' means that it must match exactly. If it does + * have it, try to match it against the pattern. If + * the refspec matches, store the ref name as it would + * appear in the server in query->src. + */ + if (!strchr(refspec->dst, '*')) { + if (!strcmp(query->dst, refspec->dst)) { + query->src = xstrdup(refspec->src); + return 0; + } + } else { + if (match_name_with_pattern(refspec->dst, query->dst, + refspec->src, &query->src)) { + return 0; + } + } + } + + return -1; +} + static int get_stale_heads_cb(const char *refname, const unsigned char *sha1, int flags, void *cb_data) { struct stale_heads_info *info = cb_data; struct refspec refspec; + int ret; memset(&refspec, 0, sizeof(refspec)); refspec.dst = (char *)refname; - if (!remote_find_tracking(info->remote, &refspec)) { - if (!((flags & REF_ISSYMREF) || - string_list_has_string(info->ref_names, refspec.src))) { - struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail); - hashcpy(ref->new_sha1, sha1); - } + + /* + * If the user speicified refspecs on the command line, we + * should only use those to check. Otherwise, look in the + * remote's configuration for the branch. + */ + if (info->ref_count) + ret = find_in_refs(info->refs, info->ref_count, &refspec); + else + ret = remote_find_tracking(info->remote, &refspec); + + /* No matches */ + if (ret) + return 0; + + /* + * If we did find a suitable refspec and it's not a symref and + * it's not in the list of refs that currently exist in that + * remote we consider it to be stale. + */ + if (!((flags & REF_ISSYMREF) || + string_list_has_string(info->ref_names, refspec.src))) { + struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail); + hashcpy(ref->new_sha1, sha1); } + + free(refspec.src); return 0; } -struct ref *get_stale_heads(struct remote *remote, struct ref *fetch_map) +struct ref *get_stale_heads(struct remote *remote, struct ref *fetch_map, + struct refspec *refs, int ref_count) { struct ref *ref, *stale_refs = NULL; struct string_list ref_names = STRING_LIST_INIT_NODUP; @@ -1711,6 +1773,8 @@ struct ref *get_stale_heads(struct remote *remote, struct ref *fetch_map) info.remote = remote; info.ref_names = &ref_names; info.stale_refs_tail = &stale_refs; + info.refs = refs; + info.ref_count = ref_count; for (ref = fetch_map; ref; ref = ref->next) string_list_append(&ref_names, ref->name); sort_string_list(&ref_names); diff --git a/remote.h b/remote.h index 9a30a9d..2f753a0 100644 --- a/remote.h +++ b/remote.h @@ -164,6 +164,7 @@ struct ref *guess_remote_head(const struct ref *head, int all); /* Return refs which no longer exist on remote */ -struct ref *get_stale_heads(struct remote *remote, struct ref *fetch_map); +struct ref *get_stale_heads(struct remote *remote, struct ref *fetch_map, + struct refspec *refs, int ref_count); #endif
-- 1.7.5.2.354.g349bf