From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2011 23:16:29 +0000 (-0700)
Subject: Merge branch 'cn/fetch-prune'
X-Git-Tag: v1.7.8-rc0~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9c0c09f791b1bfd2a04aa0e48190d304627293d2;p=git.git

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
---

9c0c09f791b1bfd2a04aa0e48190d304627293d2