Merge branch 'ct/t0000-use-test-path-is-file'

gitster · gitster · commit a42035fbe4ab · 2020-10-30T13:04:24.000-07:00
Micro clean-up of a test script.

* ct/t0000-use-test-path-is-file:
  t0000: use test_path_is_file instead of "test -f"
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
@@ -1191,7 +1191,7 @@ test_expect_success 'writing this tree with --missing-ok' '
 test_expect_success 'git read-tree followed by write-tree should be idempotent' '
 	rm -f .git/index &&
 	git read-tree $tree &&
-	test -f .git/index &&
+	test_path_is_file .git/index &&
 	newtree=$(git write-tree) &&
 	test "$newtree" = "$tree"
 '

Original file line number	Diff line number	Diff line change
`@@ -1191,7 +1191,7 @@ test_expect_success 'writing this tree with --missing-ok' '`
`1191`	`1191`	`test_expect_success 'git read-tree followed by write-tree should be idempotent' '`
`1192`	`1192`	`rm -f .git/index &&`
`1193`	`1193`	`git read-tree $tree &&`
`1194`		`- test -f .git/index &&`
	`1194`	`+ test_path_is_file .git/index &&`
`1195`	`1195`	`newtree=$(git write-tree) &&`
`1196`	`1196`	`test "$newtree" = "$tree"`
`1197`	`1197`	`'`