kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t4002-diff-basic: modernize test format 

Some tests still use the old format with four spaces indentation.
Standardize the tests to the new format with tab indentation.

Signed-off-by: John Cai <johncai86@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
John Cai 2023-05-18 20:03:15 +00:00 committed by Junio C Hamano
parent a8fcc0ac89
commit 9cfcbcc095
1 changed files with 104 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
t/t4002-diff-basic.sh
View File

@ -284,132 +284,131 @@ cmp_diff_files_output () {
test_cmp "$1" .test-tmp
}

test_expect_success \
'diff-tree of known trees.' \
'git diff-tree $tree_O $tree_A >.test-a &&
cmp -s .test-a .test-plain-OA'
test_expect_success 'diff-tree of known trees.' '
git diff-tree $tree_O $tree_A >.test-a &&
cmp -s .test-a .test-plain-OA
'

test_expect_success \
'diff-tree of known trees.' \
'git diff-tree -r $tree_O $tree_A >.test-a &&
cmp -s .test-a .test-recursive-OA'
test_expect_success 'diff-tree of known trees.' '
git diff-tree -r $tree_O $tree_A >.test-a &&
cmp -s .test-a .test-recursive-OA
'

test_expect_success \
'diff-tree of known trees.' \
'git diff-tree $tree_O $tree_B >.test-a &&
cmp -s .test-a .test-plain-OB'
test_expect_success 'diff-tree of known trees.' '
git diff-tree $tree_O $tree_B >.test-a &&
cmp -s .test-a .test-plain-OB
'

test_expect_success \
'diff-tree of known trees.' \
'git diff-tree -r $tree_O $tree_B >.test-a &&
cmp -s .test-a .test-recursive-OB'
test_expect_success 'diff-tree of known trees.' '
git diff-tree -r $tree_O $tree_B >.test-a &&
cmp -s .test-a .test-recursive-OB
'

test_expect_success \
'diff-tree of known trees.' \
'git diff-tree $tree_A $tree_B >.test-a &&
cmp -s .test-a .test-plain-AB'
test_expect_success 'diff-tree of known trees.' '
git diff-tree $tree_A $tree_B >.test-a &&
cmp -s .test-a .test-plain-AB
'

test_expect_success \
'diff-tree of known trees.' \
'git diff-tree -r $tree_A $tree_B >.test-a &&
cmp -s .test-a .test-recursive-AB'
test_expect_success 'diff-tree of known trees.' '
git diff-tree -r $tree_A $tree_B >.test-a &&
cmp -s .test-a .test-recursive-AB
'

test_expect_success \
'diff-tree --stdin of known trees.' \
'echo $tree_A $tree_B | git diff-tree --stdin > .test-a &&
test_expect_success 'diff-tree --stdin of known trees.' '
echo $tree_A $tree_B | git diff-tree --stdin > .test-a &&
echo $tree_A $tree_B > .test-plain-ABx &&
cat .test-plain-AB >> .test-plain-ABx &&
cmp -s .test-a .test-plain-ABx'
cmp -s .test-a .test-plain-ABx
'

test_expect_success \
'diff-tree --stdin of known trees.' \
'echo $tree_A $tree_B | git diff-tree -r --stdin > .test-a &&
test_expect_success 'diff-tree --stdin of known trees.' '
echo $tree_A $tree_B | git diff-tree -r --stdin > .test-a &&
echo $tree_A $tree_B > .test-recursive-ABx &&
cat .test-recursive-AB >> .test-recursive-ABx &&
cmp -s .test-a .test-recursive-ABx'
cmp -s .test-a .test-recursive-ABx
'

test_expect_success \
'diff-cache O with A in cache' \
'git read-tree $tree_A &&
test_expect_success 'diff-cache O with A in cache' '
git read-tree $tree_A &&
git diff-index --cached $tree_O >.test-a &&
cmp -s .test-a .test-recursive-OA'
cmp -s .test-a .test-recursive-OA
'

test_expect_success \
'diff-cache O with B in cache' \
'git read-tree $tree_B &&
test_expect_success 'diff-cache O with B in cache' '
git read-tree $tree_B &&
git diff-index --cached $tree_O >.test-a &&
cmp -s .test-a .test-recursive-OB'
cmp -s .test-a .test-recursive-OB
'

test_expect_success \
'diff-cache A with B in cache' \
'git read-tree $tree_B &&
test_expect_success 'diff-cache A with B in cache' '
git read-tree $tree_B &&
git diff-index --cached $tree_A >.test-a &&
cmp -s .test-a .test-recursive-AB'
cmp -s .test-a .test-recursive-AB
'

test_expect_success \
'diff-files with O in cache and A checked out' \
'rm -fr Z [A-Z][A-Z] &&
test_expect_success 'diff-files with O in cache and A checked out' '
rm -fr Z [A-Z][A-Z] &&
git read-tree $tree_A &&
git checkout-index -f -a &&
git read-tree --reset $tree_O &&
test_must_fail git update-index --refresh -q &&
git diff-files >.test-a &&
cmp_diff_files_output .test-a .test-recursive-OA'
cmp_diff_files_output .test-a .test-recursive-OA
'

test_expect_success \
'diff-files with O in cache and B checked out' \
'rm -fr Z [A-Z][A-Z] &&
test_expect_success 'diff-files with O in cache and B checked out' '
rm -fr Z [A-Z][A-Z] &&
git read-tree $tree_B &&
git checkout-index -f -a &&
git read-tree --reset $tree_O &&
test_must_fail git update-index --refresh -q &&
git diff-files >.test-a &&
cmp_diff_files_output .test-a .test-recursive-OB'
cmp_diff_files_output .test-a .test-recursive-OB
'

test_expect_success \
'diff-files with A in cache and B checked out' \
'rm -fr Z [A-Z][A-Z] &&
test_expect_success 'diff-files with A in cache and B checked out' '
rm -fr Z [A-Z][A-Z] &&
git read-tree $tree_B &&
git checkout-index -f -a &&
git read-tree --reset $tree_A &&
test_must_fail git update-index --refresh -q &&
git diff-files >.test-a &&
cmp_diff_files_output .test-a .test-recursive-AB'
cmp_diff_files_output .test-a .test-recursive-AB
'

################################################################
# Now we have established the baseline, we do not have to
# rely on individual object ID values that much.

test_expect_success \
'diff-tree O A == diff-tree -R A O' \
'git diff-tree $tree_O $tree_A >.test-a &&
test_expect_success 'diff-tree O A == diff-tree -R A O' '
git diff-tree $tree_O $tree_A >.test-a &&
git diff-tree -R $tree_A $tree_O >.test-b &&
cmp -s .test-a .test-b'
cmp -s .test-a .test-b
'

test_expect_success \
'diff-tree -r O A == diff-tree -r -R A O' \
'git diff-tree -r $tree_O $tree_A >.test-a &&
test_expect_success 'diff-tree -r O A == diff-tree -r -R A O' '
git diff-tree -r $tree_O $tree_A >.test-a &&
git diff-tree -r -R $tree_A $tree_O >.test-b &&
cmp -s .test-a .test-b'
cmp -s .test-a .test-b
'

test_expect_success \
'diff-tree B A == diff-tree -R A B' \
'git diff-tree $tree_B $tree_A >.test-a &&
test_expect_success 'diff-tree B A == diff-tree -R A B' '
git diff-tree $tree_B $tree_A >.test-a &&
git diff-tree -R $tree_A $tree_B >.test-b &&
cmp -s .test-a .test-b'
cmp -s .test-a .test-b
'

test_expect_success \
'diff-tree -r B A == diff-tree -r -R A B' \
'git diff-tree -r $tree_B $tree_A >.test-a &&
test_expect_success 'diff-tree -r B A == diff-tree -r -R A B' '
git diff-tree -r $tree_B $tree_A >.test-a &&
git diff-tree -r -R $tree_A $tree_B >.test-b &&
cmp -s .test-a .test-b'

test_expect_success \
'diff can read from stdin' \
'test_must_fail git diff --no-index -- MN - < NN |
test_expect_success'diff can read from stdin' '
test_must_fail git diff --no-index -- MN - < NN |
grep -v "^index" | sed "s#/-#/NN#" >.test-a &&
test_must_fail git diff --no-index -- MN NN |
grep -v "^index" >.test-b &&
test_cmp .test-a .test-b'
test_cmp .test-a .test-b
'

test_done