Skip to content

Commit b7cf25c

Browse files
committed
t9800: correct misuse of 'show -s --raw' in a test
There is $(git show -s --raw --pretty=format:%at HEAD) in this test that is meant to grab the author time of the commit. We used to have a bug in the command line option parser of the diff family of commands, where "show -s --raw" was identical to "show -s". With the "-s" bug fixed, "show -s --raw" would mean the same thing as "show --raw", i.e. show the output from the diff machinery in the "raw" format. And this test will start failing, so fix it before that happens. Signed-off-by: Junio C Hamano <[email protected]>
1 parent ec58344 commit b7cf25c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t9800-git-p4-basic.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ test_expect_success 'initial import time from top change time' '
330330
test_when_finished cleanup_git &&
331331
(
332332
cd "$git" &&
333-
gittime=$(git show -s --raw --pretty=format:%at HEAD) &&
333+
gittime=$(git show -s --pretty=format:%at HEAD) &&
334334
echo $p4time $gittime &&
335335
test $p4time = $gittime
336336
)

0 commit comments

Comments
 (0)