From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 9 Jul 2020 21:00:44 +0000 (-0700)
Subject: Merge branch 'tb/fix-persistent-shallow' into master
X-Git-Tag: v2.28.0-rc0~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24ecfdf206ee0e9e01f86d333d90d281fdfd12d0;p=thirdparty%2Fgit.git

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
---

24ecfdf206ee0e9e01f86d333d90d281fdfd12d0