From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Aug 2018 18:33:51 +0000 (-0700)
Subject: Merge branch 'jt/commit-graph-per-object-store'
X-Git-Tag: v2.19.0-rc0~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3bc484af74132332f5bb69401f223e2fe11bfa39?hp=-c

Merge branch 'jt/commit-graph-per-object-store'

Test update.

* jt/commit-graph-per-object-store:
t5318: avoid unnecessary command substitutions
---

3bc484af74132332f5bb69401f223e2fe11bfa39
diff --combined t/t5318-commit-graph.sh
index 1c148ebf21,d5baf63563..3c1ffad491
--- a/t/t5318-commit-graph.sh
+++ b/t/t5318-commit-graph.sh
@@@ -254,9 -254,9 +254,9 @@@ test_expect_success 'check that gc comp
  	git config gc.writeCommitGraph true &&
  	git gc &&
  	cp $objdir/info/commit-graph commit-graph-after-gc &&
 -	! test_cmp commit-graph-before-gc commit-graph-after-gc &&
 +	! test_cmp_bin commit-graph-before-gc commit-graph-after-gc &&
  	git commit-graph write --reachable &&
 -	test_cmp commit-graph-after-gc $objdir/info/commit-graph
 +	test_cmp_bin commit-graph-after-gc $objdir/info/commit-graph
  '
  
  # the verify tests below expect the commit-graph to contain
@@@ -444,25 -444,27 +444,27 @@@ test_expect_success 'setup non-the_repo
  test_expect_success 'parse_commit_in_graph works for non-the_repository' '
  	test-tool repository parse_commit_in_graph \
  		repo/.git repo "$(git -C repo rev-parse two)" >actual &&
- 	echo $(git -C repo log --pretty="%ct" -1) \
- 		$(git -C repo rev-parse one) >expect &&
+ 	{
+ 		git -C repo log --pretty=format:"%ct " -1 &&
+ 		git -C repo rev-parse one
+ 	} >expect &&
  	test_cmp expect actual &&
  
  	test-tool repository parse_commit_in_graph \
  		repo/.git repo "$(git -C repo rev-parse one)" >actual &&
- 	echo $(git -C repo log --pretty="%ct" -1 one) >expect &&
+ 	git -C repo log --pretty="%ct" -1 one >expect &&
  	test_cmp expect actual
  '
  
  test_expect_success 'get_commit_tree_in_graph works for non-the_repository' '
  	test-tool repository get_commit_tree_in_graph \
  		repo/.git repo "$(git -C repo rev-parse two)" >actual &&
- 	echo $(git -C repo rev-parse two^{tree}) >expect &&
+ 	git -C repo rev-parse two^{tree} >expect &&
  	test_cmp expect actual &&
  
  	test-tool repository get_commit_tree_in_graph \
  		repo/.git repo "$(git -C repo rev-parse one)" >actual &&
- 	echo $(git -C repo rev-parse one^{tree}) >expect &&
+ 	git -C repo rev-parse one^{tree} >expect &&
  	test_cmp expect actual
  '