]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
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

1  2 
commit-graph.c
commit.c
object.h
t/t5537-fetch-shallow.sh

diff --cc commit-graph.c
Simple merge
diff --cc commit.c
Simple merge
diff --cc object.h
Simple merge
Simple merge