]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'cn/fetch-prune' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Nov 2011 22:51:01 +0000 (15:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Nov 2011 22:51:01 +0000 (15:51 -0700)
* 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

1  2 
builtin/remote.c

Simple merge