aboutsummaryrefslogtreecommitdiff
path: root/builtin/remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-26 16:16:29 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-26 16:16:29 -0700
commit9c0c09f791b1bfd2a04aa0e48190d304627293d2 (patch)
treead77947d4cfb61a39048f3d9791282ddee377e5f /builtin/remote.c
parentf384a2edd62dfc4af0f051dc8248506cebb265f9 (diff)
parente8c1e6c796c1b96b6b208bbd4bc8cfd9acb481b5 (diff)
downloadgit-9c0c09f791b1bfd2a04aa0e48190d304627293d2.tar.gz
git-9c0c09f791b1bfd2a04aa0e48190d304627293d2.tar.xz
Merge branch 'cn/fetch-prune'
* cn/fetch-prune: fetch: treat --tags like refs/tags/*:refs/tags/* when pruning fetch: honor the user-provided refspecs when pruning refs remote: separate out the remote_find_tracking logic into query_refspecs t5510: add tests for fetch --prune fetch: free all the additional refspecs Conflicts: remote.c
Diffstat (limited to 'builtin/remote.c')
-rw-r--r--builtin/remote.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/remote.c b/builtin/remote.c
index 44eb8795c..733514979 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -349,7 +349,8 @@ 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,
+ states->remote->fetch_refspec_nr, fetch_map);
for (ref = stale_refs; ref; ref = ref->next) {
struct string_list_item *item =
string_list_append(&states->stale, abbrev_branch(ref->name));