Merge branch 'tb/fix-persistent-shallow' into master
authorJunio C Hamano <gitster@pobox.com>
Thu, 9 Jul 2020 21:00:44 +0000 (14:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Jul 2020 21:00:44 +0000 (14:00 -0700)
commit24ecfdf206ee0e9e01f86d333d90d281fdfd12d0
treecebd8275c93f7a86afa85fb6ed69fe0691034f3f
parent46be023084bd6ce4958f16427da7cdaf91cff205
parentce16364e897e70a17bd1864b6007719eeec959f3
Merge branch 'tb/fix-persistent-shallow' into master

When "fetch.writeCommitGraph" configuration is set in a shallow
repository and a fetch moves the shallow boundary, we wrote out
broken commit-graph files that do not match the reality, which has
been corrected.

* tb/fix-persistent-shallow:
  commit.c: don't persist substituted parents when unshallowing
commit-graph.c
commit.c
object.h
t/t5537-fetch-shallow.sh