Signed-off-by: Jonathan Chang <ttjtftx@xxxxxxxxx> --- t/t0000-basic.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index 3de13daabe..49923c5ff1 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -1118,16 +1118,18 @@ P=$(test_oid root) test_expect_success 'git commit-tree records the correct tree in a commit' ' commit0=$(echo NO | git commit-tree $P) && - git show --pretty=raw $commit0 >actual && - tree=$(sed -n -e "s/^tree //p" -e "/^author /q" actual) && - test "z$tree" = "z$P" + git show --pretty=raw $commit0 >output && + echo "$P" >expect && + sed -n -e "s/^tree //p" -e "/^author /q" output >actual && + test_cmp expect actual ' test_expect_success 'git commit-tree records the correct parent in a commit' ' commit1=$(echo NO | git commit-tree $P -p $commit0) && - git show --pretty=raw $commit1 >actual && - parent=$(sed -n -e "s/^parent //p" -e "/^author /q" actual) && - test "z$commit0" = "z$parent" + git show --pretty=raw $commit1 >output && + echo "$commit0" >expect && + sed -n -e "s/^parent //p" -e "/^author /q" output >actual && + test_cmp expect actual ' test_expect_success 'git commit-tree omits duplicated parent in a commit' ' -- 2.21.0
