Merge branch 'js/shallow-and-fetch-prune' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:51 +0000 (22:57 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:51 +0000 (22:57 +0900)
commitd0975a0724cc8f0f88931264b8b97c8a4c428dda
tree9f78eb6e4070aeddb1488315fbcac313811c98d4
parent7d483e9c00516413a9c2dafc24a6ecb40975b02b
parent5dcfbf564c0f10869e568af4e05421f63b44fbbf
Merge branch 'js/shallow-and-fetch-prune' into maint

"git repack" in a shallow clone did not correctly update the
shallow points in the repository, leading to a repository that
does not pass fsck.

* js/shallow-and-fetch-prune:
  repack -ad: prune the list of shallow commits
  shallow: offer to prune only non-existing entries
  repack: point out a bug handling stale shallow info
commit.h