Code

Merge branch 'cn/fetch-prune'
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:16:29 +0000 (16:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2011 23:16:29 +0000 (16:16 -0700)
commit9c0c09f791b1bfd2a04aa0e48190d304627293d2
treead77947d4cfb61a39048f3d9791282ddee377e5f
parentf384a2edd62dfc4af0f051dc8248506cebb265f9
parente8c1e6c796c1b96b6b208bbd4bc8cfd9acb481b5
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
builtin/fetch.c
builtin/remote.c
remote.c
remote.h