Merge branch 'jc/t9800-fix-use-of-show-s-raw'

gitster · gitster · commit 3fb8a0f0a24c · 2023-05-15T13:59:05.000-07:00
A test fix.

* jc/t9800-fix-use-of-show-s-raw:
  t9800: correct misuse of 'show -s --raw' in a test
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
@@ -330,7 +330,7 @@ test_expect_success 'initial import time from top change time' '
 	test_when_finished cleanup_git &&
 	(
 		cd "$git" &&
-		gittime=$(git show -s --raw --pretty=format:%at HEAD) &&
+		gittime=$(git show -s --pretty=format:%at HEAD) &&
 		echo $p4time $gittime &&
 		test $p4time = $gittime
 	)

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ test_expect_success 'initial import time from top change time' '`
`330`	`330`	`test_when_finished cleanup_git &&`
`331`	`331`	`(`
`332`	`332`	`cd "$git" &&`
`333`		`- gittime=$(git show -s --raw --pretty=format:%at HEAD) &&`
	`333`	`+ gittime=$(git show -s --pretty=format:%at HEAD) &&`
`334`	`334`	`echo $p4time $gittime &&`
`335`	`335`	`test $p4time = $gittime`
`336`	`336`	`)`