summaryrefslogtreecommitdiff
path: root/remote.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-26 23:16:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-26 23:16:29 (GMT)
commit9c0c09f791b1bfd2a04aa0e48190d304627293d2 (patch)
treead77947d4cfb61a39048f3d9791282ddee377e5f /remote.h
parentf384a2edd62dfc4af0f051dc8248506cebb265f9 (diff)
parente8c1e6c796c1b96b6b208bbd4bc8cfd9acb481b5 (diff)
downloadgit-9c0c09f791b1bfd2a04aa0e48190d304627293d2.zip
git-9c0c09f791b1bfd2a04aa0e48190d304627293d2.tar.gz
git-9c0c09f791b1bfd2a04aa0e48190d304627293d2.tar.bz2
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 'remote.h')
-rw-r--r--remote.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/remote.h b/remote.h
index 6729477..b395598 100644
--- a/remote.h
+++ b/remote.h
@@ -164,6 +164,6 @@ 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 refspec *refs, int ref_count, struct ref *fetch_map);
#endif