Merge branch 'tb/reset-shallow'
commit2b4ff3d3dc64d4abcded7caa9bcdf063aea5ec3f
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 May 2020 20:39:51 +0000 (1 13:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 May 2020 20:39:51 +0000 (1 13:39 -0700)
treed92a6b80a57a024256b1306665e629ae1d4b8185
parentcc0c732f6ba533ed4ee9f8a29f30628b04dba373
parent37b9dcabfc48b0cbce638140279878dac37aec73
Merge branch 'tb/reset-shallow'

Fix in-core inconsistency after fetching into a shallow repository
that broke the code to write out commit-graph.

* tb/reset-shallow:
  shallow.c: use '{commit,rollback}_shallow_file'
  t5537: use test_write_lines and indented heredocs for readability
builtin/receive-pack.c
fetch-pack.c
shallow.c
t/t5537-fetch-shallow.sh