From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 1 May 2020 20:39:51 +0000 (-0700)
Subject: Merge branch 'tb/reset-shallow'
X-Git-Tag: v2.27.0-rc0~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b4ff3d3dc64d4abcded7caa9bcdf063aea5ec3f;p=thirdparty%2Fgit.git

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

2b4ff3d3dc64d4abcded7caa9bcdf063aea5ec3f
diff --cc t/t5537-fetch-shallow.sh
index b57209c84f,126654817d..d427a2d7f7
--- a/t/t5537-fetch-shallow.sh
+++ b/t/t5537-fetch-shallow.sh
@@@ -131,16 -108,12 +108,12 @@@ test_expect_success 'fetch that require
  	git init notshallow &&
  	(
  	cd notshallow &&
 -	git fetch ../shallow/.git refs/heads/*:refs/remotes/shallow/*&&
 +	git fetch ../shallow/.git refs/heads/*:refs/remotes/shallow/* &&
  	git for-each-ref --format="%(refname)" >actual.refs &&
- 	cat <<EOF >expect.refs &&
- refs/remotes/shallow/no-shallow
- EOF
+ 	echo refs/remotes/shallow/no-shallow >expect.refs &&
  	test_cmp expect.refs actual.refs &&
  	git log --format=%s shallow/no-shallow >actual &&
- 	cat <<EOF >expect &&
- no-shallow
- EOF
+ 	echo no-shallow >expect &&
  	test_cmp expect actual
  	)
  '