Merge branch 'js/shallow-and-fetch-prune'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Nov 2018 06:50:18 +0000 (15:50 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Nov 2018 06:50:18 +0000 (15:50 +0900)
commitea100b6dcba03053baed5a1e20c1a2644957b02e
tree9a1f02da22c743c835d3d5fc6cb678d61891992c
parenta5ab66ee5f36fa3e90955f36f6451b3cf67943ed
parent5dcfbf564c0f10869e568af4e05421f63b44fbbf
Merge branch 'js/shallow-and-fetch-prune'

"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
builtin/prune.c
builtin/repack.c
commit.h
shallow.c