diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-01 15:51:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-01 15:51:01 -0700 |
| commit | ffa4c364f4ec090438de48a986f02cdeb302b46c (patch) | |
| tree | 77e36e8aed5636e19301cef6aa93603bd0245b17 /builtin/remote.c | |
| parent | 7fa6c90c72fb8dc8277d7cae759d5036046a5164 (diff) | |
| parent | e8c1e6c796c1b96b6b208bbd4bc8cfd9acb481b5 (diff) | |
| download | git-ffa4c364f4ec090438de48a986f02cdeb302b46c.tar.gz | |
Merge branch 'cn/fetch-prune' into maint
* 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
Diffstat (limited to 'builtin/remote.c')
| -rw-r--r-- | builtin/remote.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/remote.c b/builtin/remote.c index b25dfb4422..e1285becff 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)); |