Merge branch 'nd/fetch-pack-shallow-fix' into maint
commit2ea3df68e881405940596b8c299921f681f8c22c
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Sep 2013 21:40:58 +0000 (5 14:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Sep 2013 21:40:58 +0000 (5 14:40 -0700)
tree55a5973fe24539164e49fde425af6590822e5e6b
parentbda790474690a5e5e9963221dc0d5b66fbf01875
parent6da8bdcbbfd5ac9c4a92de79d7b4343d5d6bd4c5
Merge branch 'nd/fetch-pack-shallow-fix' into maint

The recent "short-cut clone connectivity check" topic broke a shallow
repository when a fetch operation tries to auto-follow tags.

* nd/fetch-pack-shallow-fix:
  fetch-pack: do not remove .git/shallow file when --depth is not specified
fetch-pack.c