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

t1002-read-tree-m-u-2way: modernize test format 

Some tests are still using the older four space indent format. Update
these to use tabs.

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:10 +00:00 committed by Junio C Hamano
parent 58db6e450b
commit a10bb2ded5
1 changed files with 288 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

167
t/t1002-read-tree-m-u-2way.sh
View File

@ -37,9 +37,8 @@ check_cache_at () {
esac esac
} }


test_expect_success \ test_expect_success setup '
setup \ echo frotz >frotz &&
'echo frotz >frotz &&
echo nitfol >nitfol && echo nitfol >nitfol &&
echo bozbar >bozbar && echo bozbar >bozbar &&
echo rezrov >rezrov && echo rezrov >rezrov &&
@ -57,11 +56,11 @@ test_expect_success \
cp bozbar bozbar.M && cp bozbar bozbar.M &&
cp frotz frotz.M && cp frotz frotz.M &&
cp nitfol nitfol.M && cp nitfol nitfol.M &&
git diff-tree $treeH $treeM' git diff-tree $treeH $treeM
'


test_expect_success \ test_expect_success '1, 2, 3 - no carry forward' '
'1, 2, 3 - no carry forward' \ rm -f .git/index nitfol bozbar rezrov frotz &&
'rm -f .git/index nitfol bozbar rezrov frotz &&
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
read_tree_u_must_succeed -m -u $treeH $treeM && read_tree_u_must_succeed -m -u $treeH $treeM &&
git ls-files --stage >1-3.out && git ls-files --stage >1-3.out &&
@ -71,11 +70,11 @@ test_expect_success \
test_cmp nitfol.M nitfol && test_cmp nitfol.M nitfol &&
check_cache_at bozbar clean && check_cache_at bozbar clean &&
check_cache_at frotz clean && check_cache_at frotz clean &&
check_cache_at nitfol clean' check_cache_at nitfol clean
'


test_expect_success \ test_expect_success '4 - carry forward local addition.' '
'4 - carry forward local addition.' \ rm -f .git/index nitfol bozbar rezrov frotz &&
'rm -f .git/index nitfol bozbar rezrov frotz &&
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo "+100644 X 0 yomin" >expected && echo "+100644 X 0 yomin" >expected &&
echo yomin >yomin && echo yomin >yomin &&
@ -90,11 +89,11 @@ test_expect_success \
test_cmp nitfol.M nitfol && test_cmp nitfol.M nitfol &&
echo yomin >yomin1 && echo yomin >yomin1 &&
diff yomin yomin1 && diff yomin yomin1 &&
rm -f yomin1' rm -f yomin1
'


test_expect_success \ test_expect_success '5 - carry forward local addition.' '
'5 - carry forward local addition.' \ rm -f .git/index nitfol bozbar rezrov frotz &&
'rm -f .git/index nitfol bozbar rezrov frotz &&
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
read_tree_u_must_succeed -m -u $treeH && read_tree_u_must_succeed -m -u $treeH &&
echo yomin >yomin && echo yomin >yomin &&
@ -111,11 +110,11 @@ test_expect_success \
: dirty index should have prevented -u from checking it out. && : dirty index should have prevented -u from checking it out. &&
echo yomin yomin >yomin1 && echo yomin yomin >yomin1 &&
diff yomin yomin1 && diff yomin yomin1 &&
rm -f yomin1' rm -f yomin1
'


test_expect_success \ test_expect_success '6 - local addition already has the same.' '
'6 - local addition already has the same.' \ rm -f .git/index nitfol bozbar rezrov frotz &&
'rm -f .git/index nitfol bozbar rezrov frotz &&
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo frotz >frotz && echo frotz >frotz &&
git update-index --add frotz && git update-index --add frotz &&
@ -128,11 +127,11 @@ test_expect_success \
test_cmp nitfol.M nitfol && test_cmp nitfol.M nitfol &&
echo frotz >frotz1 && echo frotz >frotz1 &&
diff frotz frotz1 && diff frotz frotz1 &&
rm -f frotz1' rm -f frotz1
'


test_expect_success \ test_expect_success '7 - local addition already has the same.' '
'7 - local addition already has the same.' \ rm -f .git/index nitfol bozbar rezrov frotz &&
'rm -f .git/index nitfol bozbar rezrov frotz &&
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo frotz >frotz && echo frotz >frotz &&
git update-index --add frotz && git update-index --add frotz &&
@ -146,28 +145,28 @@ test_expect_success \
: dirty index should have prevented -u from checking it out. && : dirty index should have prevented -u from checking it out. &&
echo frotz frotz >frotz1 && echo frotz frotz >frotz1 &&
diff frotz frotz1 && diff frotz frotz1 &&
rm -f frotz1' rm -f frotz1
'


test_expect_success \ test_expect_success '8 - conflicting addition.' '
'8 - conflicting addition.' \ rm -f .git/index nitfol bozbar rezrov frotz &&
'rm -f .git/index nitfol bozbar rezrov frotz &&
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo frotz frotz >frotz && echo frotz frotz >frotz &&
git update-index --add frotz && git update-index --add frotz &&
! read_tree_u_must_succeed -m -u $treeH $treeM' ! read_tree_u_must_succeed -m -u $treeH $treeM
'


test_expect_success \ test_expect_success '9 - conflicting addition.' '
'9 - conflicting addition.' \ rm -f .git/index nitfol bozbar rezrov frotz &&
'rm -f .git/index nitfol bozbar rezrov frotz &&
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo frotz frotz >frotz && echo frotz frotz >frotz &&
git update-index --add frotz && git update-index --add frotz &&
echo frotz >frotz && echo frotz >frotz &&
! read_tree_u_must_succeed -m -u $treeH $treeM' ! read_tree_u_must_succeed -m -u $treeH $treeM
'


test_expect_success \ test_expect_success '10 - path removed.' '
'10 - path removed.' \ rm -f .git/index nitfol bozbar rezrov frotz &&
'rm -f .git/index nitfol bozbar rezrov frotz &&
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo rezrov >rezrov && echo rezrov >rezrov &&
git update-index --add rezrov && git update-index --add rezrov &&
@ -179,40 +178,39 @@ test_expect_success \
test_cmp nitfol.M nitfol test_cmp nitfol.M nitfol
' '


test_expect_success \ test_expect_success '11 - dirty path removed.' '
'11 - dirty path removed.' \ rm -f .git/index nitfol bozbar rezrov frotz &&
'rm -f .git/index nitfol bozbar rezrov frotz &&
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo rezrov >rezrov && echo rezrov >rezrov &&
git update-index --add rezrov && git update-index --add rezrov &&
echo rezrov rezrov >rezrov && echo rezrov rezrov >rezrov &&
! read_tree_u_must_succeed -m -u $treeH $treeM' ! read_tree_u_must_succeed -m -u $treeH $treeM
'


test_expect_success \ test_expect_success '12 - unmatching local changes being removed.' '
'12 - unmatching local changes being removed.' \ rm -f .git/index nitfol bozbar rezrov frotz &&
'rm -f .git/index nitfol bozbar rezrov frotz &&
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo rezrov rezrov >rezrov && echo rezrov rezrov >rezrov &&
git update-index --add rezrov && git update-index --add rezrov &&
! read_tree_u_must_succeed -m -u $treeH $treeM' ! read_tree_u_must_succeed -m -u $treeH $treeM
'


test_expect_success \ test_expect_success '13 - unmatching local changes being removed.' '
'13 - unmatching local changes being removed.' \ rm -f .git/index nitfol bozbar rezrov frotz &&
'rm -f .git/index nitfol bozbar rezrov frotz &&
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo rezrov rezrov >rezrov && echo rezrov rezrov >rezrov &&
git update-index --add rezrov && git update-index --add rezrov &&
echo rezrov >rezrov && echo rezrov >rezrov &&
! read_tree_u_must_succeed -m -u $treeH $treeM' ! read_tree_u_must_succeed -m -u $treeH $treeM
'


cat >expected <<EOF cat >expected <<EOF
-100644 X 0 nitfol -100644 X 0 nitfol
+100644 X 0 nitfol +100644 X 0 nitfol
EOF EOF


test_expect_success \ test_expect_success '14 - unchanged in two heads.' '
'14 - unchanged in two heads.' \ rm -f .git/index nitfol bozbar rezrov frotz &&
'rm -f .git/index nitfol bozbar rezrov frotz &&
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo nitfol nitfol >nitfol && echo nitfol nitfol >nitfol &&
git update-index --add nitfol && git update-index --add nitfol &&
@ -225,11 +223,11 @@ test_expect_success \
check_cache_at nitfol clean && check_cache_at nitfol clean &&
echo nitfol nitfol >nitfol1 && echo nitfol nitfol >nitfol1 &&
diff nitfol nitfol1 && diff nitfol nitfol1 &&
rm -f nitfol1' rm -f nitfol1
'


test_expect_success \ test_expect_success '15 - unchanged in two heads.' '
'15 - unchanged in two heads.' \ rm -f .git/index nitfol bozbar rezrov frotz &&
'rm -f .git/index nitfol bozbar rezrov frotz &&
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo nitfol nitfol >nitfol && echo nitfol nitfol >nitfol &&
git update-index --add nitfol && git update-index --add nitfol &&
@ -243,28 +241,28 @@ test_expect_success \
test_cmp frotz.M frotz && test_cmp frotz.M frotz &&
echo nitfol nitfol nitfol >nitfol1 && echo nitfol nitfol nitfol >nitfol1 &&
diff nitfol nitfol1 && diff nitfol nitfol1 &&
rm -f nitfol1' rm -f nitfol1
'


test_expect_success \ test_expect_success '16 - conflicting local change.' '
'16 - conflicting local change.' \ rm -f .git/index nitfol bozbar rezrov frotz &&
'rm -f .git/index nitfol bozbar rezrov frotz &&
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo bozbar bozbar >bozbar && echo bozbar bozbar >bozbar &&
git update-index --add bozbar && git update-index --add bozbar &&
! read_tree_u_must_succeed -m -u $treeH $treeM' ! read_tree_u_must_succeed -m -u $treeH $treeM
'


test_expect_success \ test_expect_success '17 - conflicting local change.' '
'17 - conflicting local change.' \ rm -f .git/index nitfol bozbar rezrov frotz &&
'rm -f .git/index nitfol bozbar rezrov frotz &&
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo bozbar bozbar >bozbar && echo bozbar bozbar >bozbar &&
git update-index --add bozbar && git update-index --add bozbar &&
echo bozbar bozbar bozbar >bozbar && echo bozbar bozbar bozbar >bozbar &&
! read_tree_u_must_succeed -m -u $treeH $treeM' ! read_tree_u_must_succeed -m -u $treeH $treeM
'


test_expect_success \ test_expect_success '18 - local change already having a good result.' '
'18 - local change already having a good result.' \ rm -f .git/index nitfol bozbar rezrov frotz &&
'rm -f .git/index nitfol bozbar rezrov frotz &&
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo gnusto >bozbar && echo gnusto >bozbar &&
git update-index --add bozbar && git update-index --add bozbar &&
@ -277,9 +275,8 @@ test_expect_success \
test_cmp nitfol.M nitfol test_cmp nitfol.M nitfol
' '


test_expect_success \ test_expect_success '19 - local change already having a good result, further modified.' '
'19 - local change already having a good result, further modified.' \ rm -f .git/index nitfol bozbar rezrov frotz &&
'rm -f .git/index nitfol bozbar rezrov frotz &&
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo gnusto >bozbar && echo gnusto >bozbar &&
git update-index --add bozbar && git update-index --add bozbar &&
@ -292,11 +289,11 @@ test_expect_success \
test_cmp nitfol.M nitfol && test_cmp nitfol.M nitfol &&
echo gnusto gnusto >bozbar1 && echo gnusto gnusto >bozbar1 &&
diff bozbar bozbar1 && diff bozbar bozbar1 &&
rm -f bozbar1' rm -f bozbar1
'


test_expect_success \ test_expect_success '20 - no local change, use new tree.' '
'20 - no local change, use new tree.' \ rm -f .git/index nitfol bozbar rezrov frotz &&
'rm -f .git/index nitfol bozbar rezrov frotz &&
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo bozbar >bozbar && echo bozbar >bozbar &&
git update-index --add bozbar && git update-index --add bozbar &&
@ -309,19 +306,18 @@ test_expect_success \
test_cmp nitfol.M nitfol test_cmp nitfol.M nitfol
' '


test_expect_success \ test_expect_success '21 - no local change, dirty cache.' '
'21 - no local change, dirty cache.' \ rm -f .git/index nitfol bozbar rezrov frotz &&
'rm -f .git/index nitfol bozbar rezrov frotz &&
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo bozbar >bozbar && echo bozbar >bozbar &&
git update-index --add bozbar && git update-index --add bozbar &&
echo gnusto gnusto >bozbar && echo gnusto gnusto >bozbar &&
! read_tree_u_must_succeed -m -u $treeH $treeM' ! read_tree_u_must_succeed -m -u $treeH $treeM
'


# Also make sure we did not break DF vs DF/DF case. # Also make sure we did not break DF vs DF/DF case.
test_expect_success \ test_expect_success 'DF vs DF/DF case setup.' '
'DF vs DF/DF case setup.' \ rm -f .git/index &&
'rm -f .git/index &&
echo DF >DF && echo DF >DF &&
git update-index --add DF && git update-index --add DF &&
treeDF=$(git write-tree) && treeDF=$(git write-tree) &&
@ -335,17 +331,18 @@ test_expect_success \
treeDFDF=$(git write-tree) && treeDFDF=$(git write-tree) &&
echo treeDFDF $treeDFDF && echo treeDFDF $treeDFDF &&
git ls-tree $treeDFDF && git ls-tree $treeDFDF &&
git ls-files --stage >DFDF.out' git ls-files --stage >DFDF.out
'


test_expect_success \ test_expect_success 'DF vs DF/DF case test.' '
'DF vs DF/DF case test.' \ rm -f .git/index &&
'rm -f .git/index &&
rm -fr DF && rm -fr DF &&
echo DF >DF && echo DF >DF &&
git update-index --add DF && git update-index --add DF &&
read_tree_u_must_succeed -m -u $treeDF $treeDFDF && read_tree_u_must_succeed -m -u $treeDF $treeDFDF &&
git ls-files --stage >DFDFcheck.out && git ls-files --stage >DFDFcheck.out &&
test_cmp DFDF.out DFDFcheck.out && test_cmp DFDF.out DFDFcheck.out &&
check_cache_at DF/DF clean' check_cache_at DF/DF clean
'


test_done test_done