t1001: modernize style

The preferred style in tests is:

    test_expect_success 'short description then sq to open the body' '
	    here comes the test &&
	    and chains over many lines &&
	    with closing sq on its own line
    '

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Stefan Beller 2017-01-09 17:45:41 -08:00 committed by Junio C Hamano
parent 0b8b25f610
commit 83587d5236
1 changed files with 295 additions and 296 deletions

View File

@ -14,10 +14,10 @@ all the combinations described in the two-tree merge "carry forward"
rules, found in <Documentation/git read-tree.txt>. rules, found in <Documentation/git read-tree.txt>.


In the test, these paths are used: In the test, these paths are used:
bozbar - in H, stays in M, modified from bozbar to gnusto bozbar - in H, stays in M, modified from bozbar to gnusto
frotz - not in H added in M frotz - not in H added in M
nitfol - in H, stays in M unmodified nitfol - in H, stays in M unmodified
rezrov - in H, deleted in M rezrov - in H, deleted in M
yomin - not in H or M yomin - not in H or M
' '
. ./test-lib.sh . ./test-lib.sh
@ -60,336 +60,335 @@ EOF


sed -e 's/bozbar/gnusto (earlier bozbar)/' bozbar-old >bozbar-new sed -e 's/bozbar/gnusto (earlier bozbar)/' bozbar-old >bozbar-new


test_expect_success \ test_expect_success 'setup' '
setup \ echo frotz >frotz &&
'echo frotz >frotz && echo nitfol >nitfol &&
echo nitfol >nitfol && cat bozbar-old >bozbar &&
cat bozbar-old >bozbar && echo rezrov >rezrov &&
echo rezrov >rezrov && echo yomin >yomin &&
echo yomin >yomin && git update-index --add nitfol bozbar rezrov &&
git update-index --add nitfol bozbar rezrov && treeH=$(git write-tree) &&
treeH=$(git write-tree) && echo treeH $treeH &&
echo treeH $treeH && git ls-tree $treeH &&
git ls-tree $treeH &&


cat bozbar-new >bozbar && cat bozbar-new >bozbar &&
git update-index --add frotz bozbar --force-remove rezrov && git update-index --add frotz bozbar --force-remove rezrov &&
git ls-files --stage >M.out && git ls-files --stage >M.out &&
treeM=$(git write-tree) && treeM=$(git write-tree) &&
echo treeM $treeM && echo treeM $treeM &&
git ls-tree $treeM && git ls-tree $treeM &&
git diff-tree $treeH $treeM' git diff-tree $treeH $treeM

'
test_expect_success \
'1, 2, 3 - no carry forward' \
'rm -f .git/index &&
read_tree_twoway $treeH $treeM &&
git ls-files --stage >1-3.out &&
test_cmp M.out 1-3.out &&
check_cache_at bozbar dirty &&
check_cache_at frotz dirty &&
check_cache_at nitfol dirty'


test_expect_success '1, 2, 3 - no carry forward' '
rm -f .git/index &&
read_tree_twoway $treeH $treeM &&
git ls-files --stage >1-3.out &&
test_cmp M.out 1-3.out &&
check_cache_at bozbar dirty &&
check_cache_at frotz dirty &&
check_cache_at nitfol dirty
'
echo '+100644 X 0 yomin' >expected echo '+100644 X 0 yomin' >expected


test_expect_success \ test_expect_success '4 - carry forward local addition.' '
'4 - carry forward local addition.' \ rm -f .git/index &&
'rm -f .git/index && read_tree_must_succeed $treeH &&
read_tree_must_succeed $treeH && git checkout-index -u -f -q -a &&
git checkout-index -u -f -q -a && git update-index --add yomin &&
git update-index --add yomin && read_tree_twoway $treeH $treeM &&
read_tree_twoway $treeH $treeM && git ls-files --stage >4.out &&
git ls-files --stage >4.out && test_must_fail git diff --no-index M.out 4.out >4diff.out &&
test_must_fail git diff --no-index M.out 4.out >4diff.out && compare_change 4diff.out expected &&
compare_change 4diff.out expected && check_cache_at yomin clean
check_cache_at yomin clean' '


test_expect_success \ test_expect_success '5 - carry forward local addition.' '
'5 - carry forward local addition.' \ rm -f .git/index &&
'rm -f .git/index && read_tree_must_succeed $treeH &&
read_tree_must_succeed $treeH && git checkout-index -u -f -q -a &&
git checkout-index -u -f -q -a && echo yomin >yomin &&
echo yomin >yomin && git update-index --add yomin &&
git update-index --add yomin && echo yomin yomin >yomin &&
echo yomin yomin >yomin && read_tree_twoway $treeH $treeM &&
read_tree_twoway $treeH $treeM && git ls-files --stage >5.out &&
git ls-files --stage >5.out && test_must_fail git diff --no-index M.out 5.out >5diff.out &&
test_must_fail git diff --no-index M.out 5.out >5diff.out && compare_change 5diff.out expected &&
compare_change 5diff.out expected && check_cache_at yomin dirty
check_cache_at yomin dirty' '


test_expect_success \ test_expect_success '6 - local addition already has the same.' '
'6 - local addition already has the same.' \ rm -f .git/index &&
'rm -f .git/index && read_tree_must_succeed $treeH &&
read_tree_must_succeed $treeH && git checkout-index -u -f -q -a &&
git checkout-index -u -f -q -a && git update-index --add frotz &&
git update-index --add frotz && read_tree_twoway $treeH $treeM &&
read_tree_twoway $treeH $treeM && git ls-files --stage >6.out &&
git ls-files --stage >6.out && test_cmp M.out 6.out &&
test_cmp M.out 6.out && check_cache_at frotz clean
check_cache_at frotz clean' '


test_expect_success \ test_expect_success '7 - local addition already has the same.' '
'7 - local addition already has the same.' \ rm -f .git/index &&
'rm -f .git/index && read_tree_must_succeed $treeH &&
read_tree_must_succeed $treeH && git checkout-index -u -f -q -a &&
git checkout-index -u -f -q -a && echo frotz >frotz &&
echo frotz >frotz && git update-index --add frotz &&
git update-index --add frotz && echo frotz frotz >frotz &&
echo frotz frotz >frotz && read_tree_twoway $treeH $treeM &&
read_tree_twoway $treeH $treeM && git ls-files --stage >7.out &&
git ls-files --stage >7.out && test_cmp M.out 7.out &&
test_cmp M.out 7.out && check_cache_at frotz dirty
check_cache_at frotz dirty' '


test_expect_success \ test_expect_success '8 - conflicting addition.' '
'8 - conflicting addition.' \ rm -f .git/index &&
'rm -f .git/index && read_tree_must_succeed $treeH &&
read_tree_must_succeed $treeH && git checkout-index -u -f -q -a &&
git checkout-index -u -f -q -a && echo frotz frotz >frotz &&
echo frotz frotz >frotz && git update-index --add frotz &&
git update-index --add frotz && if read_tree_twoway $treeH $treeM; then false; else :; fi
if read_tree_twoway $treeH $treeM; then false; else :; fi' '


test_expect_success \ test_expect_success '9 - conflicting addition.' '
'9 - conflicting addition.' \ rm -f .git/index &&
'rm -f .git/index && read_tree_must_succeed $treeH &&
read_tree_must_succeed $treeH && git checkout-index -u -f -q -a &&
git checkout-index -u -f -q -a && echo frotz frotz >frotz &&
echo frotz frotz >frotz && git update-index --add frotz &&
git update-index --add frotz && echo frotz >frotz &&
echo frotz >frotz && if read_tree_twoway $treeH $treeM; then false; else :; fi
if read_tree_twoway $treeH $treeM; then false; else :; fi' '


test_expect_success \ test_expect_success '10 - path removed.' '
'10 - path removed.' \ rm -f .git/index &&
'rm -f .git/index && read_tree_must_succeed $treeH &&
read_tree_must_succeed $treeH && git checkout-index -u -f -q -a &&
git checkout-index -u -f -q -a && echo rezrov >rezrov &&
echo rezrov >rezrov && git update-index --add rezrov &&
git update-index --add rezrov && read_tree_twoway $treeH $treeM &&
read_tree_twoway $treeH $treeM && git ls-files --stage >10.out &&
git ls-files --stage >10.out && test_cmp M.out 10.out
test_cmp M.out 10.out' '


test_expect_success \ test_expect_success '11 - dirty path removed.' '
'11 - dirty path removed.' \ rm -f .git/index &&
'rm -f .git/index && read_tree_must_succeed $treeH &&
read_tree_must_succeed $treeH && git checkout-index -u -f -q -a &&
git checkout-index -u -f -q -a && echo rezrov >rezrov &&
echo rezrov >rezrov && git update-index --add rezrov &&
git update-index --add rezrov && echo rezrov rezrov >rezrov &&
echo rezrov rezrov >rezrov && if read_tree_twoway $treeH $treeM; then false; else :; fi
if read_tree_twoway $treeH $treeM; then false; else :; fi' '


test_expect_success \ test_expect_success '12 - unmatching local changes being removed.' '
'12 - unmatching local changes being removed.' \ rm -f .git/index &&
'rm -f .git/index && read_tree_must_succeed $treeH &&
read_tree_must_succeed $treeH && git checkout-index -u -f -q -a &&
git checkout-index -u -f -q -a && echo rezrov rezrov >rezrov &&
echo rezrov rezrov >rezrov && git update-index --add rezrov &&
git update-index --add rezrov && if read_tree_twoway $treeH $treeM; then false; else :; fi
if read_tree_twoway $treeH $treeM; then false; else :; fi' '


test_expect_success \ test_expect_success '13 - unmatching local changes being removed.' '
'13 - unmatching local changes being removed.' \ rm -f .git/index &&
'rm -f .git/index && read_tree_must_succeed $treeH &&
read_tree_must_succeed $treeH && git checkout-index -u -f -q -a &&
git checkout-index -u -f -q -a && echo rezrov rezrov >rezrov &&
echo rezrov rezrov >rezrov && git update-index --add rezrov &&
git update-index --add rezrov && echo rezrov >rezrov &&
echo rezrov >rezrov && if read_tree_twoway $treeH $treeM; then false; else :; fi
if read_tree_twoway $treeH $treeM; then false; else :; fi' '


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 &&
'rm -f .git/index && read_tree_must_succeed $treeH &&
read_tree_must_succeed $treeH && git checkout-index -u -f -q -a &&
git checkout-index -u -f -q -a && echo nitfol nitfol >nitfol &&
echo nitfol nitfol >nitfol && git update-index --add nitfol &&
git update-index --add nitfol && read_tree_twoway $treeH $treeM &&
read_tree_twoway $treeH $treeM && git ls-files --stage >14.out &&
git ls-files --stage >14.out && test_must_fail git diff --no-index M.out 14.out >14diff.out &&
test_must_fail git diff --no-index M.out 14.out >14diff.out && compare_change 14diff.out expected &&
compare_change 14diff.out expected && check_cache_at nitfol clean
check_cache_at nitfol clean' '


test_expect_success \ test_expect_success '15 - unchanged in two heads.' '
'15 - unchanged in two heads.' \ rm -f .git/index &&
'rm -f .git/index && read_tree_must_succeed $treeH &&
read_tree_must_succeed $treeH && git checkout-index -u -f -q -a &&
git checkout-index -u -f -q -a && echo nitfol nitfol >nitfol &&
echo nitfol nitfol >nitfol && git update-index --add nitfol &&
git update-index --add nitfol && echo nitfol nitfol nitfol >nitfol &&
echo nitfol nitfol nitfol >nitfol && read_tree_twoway $treeH $treeM &&
read_tree_twoway $treeH $treeM && git ls-files --stage >15.out &&
git ls-files --stage >15.out && test_must_fail git diff --no-index M.out 15.out >15diff.out &&
test_must_fail git diff --no-index M.out 15.out >15diff.out && compare_change 15diff.out expected &&
compare_change 15diff.out expected && check_cache_at nitfol dirty
check_cache_at nitfol dirty' '


test_expect_success \ test_expect_success '16 - conflicting local change.' '
'16 - conflicting local change.' \ rm -f .git/index &&
'rm -f .git/index && read_tree_must_succeed $treeH &&
read_tree_must_succeed $treeH && git checkout-index -u -f -q -a &&
git checkout-index -u -f -q -a && echo bozbar bozbar >bozbar &&
echo bozbar bozbar >bozbar && git update-index --add bozbar &&
git update-index --add bozbar && if read_tree_twoway $treeH $treeM; then false; else :; fi
if read_tree_twoway $treeH $treeM; then false; else :; fi' '


test_expect_success \ test_expect_success '17 - conflicting local change.' '
'17 - conflicting local change.' \ rm -f .git/index &&
'rm -f .git/index && read_tree_must_succeed $treeH &&
read_tree_must_succeed $treeH && git checkout-index -u -f -q -a &&
git checkout-index -u -f -q -a && 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 && if read_tree_twoway $treeH $treeM; then false; else :; fi
if read_tree_twoway $treeH $treeM; then false; else :; fi' '


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 &&
'rm -f .git/index && read_tree_must_succeed $treeH &&
read_tree_must_succeed $treeH && git checkout-index -u -f -q -a &&
git checkout-index -u -f -q -a && cat bozbar-new >bozbar &&
cat bozbar-new >bozbar && git update-index --add bozbar &&
git update-index --add bozbar && read_tree_twoway $treeH $treeM &&
read_tree_twoway $treeH $treeM && git ls-files --stage >18.out &&
git ls-files --stage >18.out && test_cmp M.out 18.out &&
test_cmp M.out 18.out && check_cache_at bozbar clean
check_cache_at bozbar clean' '


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 &&
'rm -f .git/index && read_tree_must_succeed $treeH &&
read_tree_must_succeed $treeH && git checkout-index -u -f -q -a &&
git checkout-index -u -f -q -a && cat bozbar-new >bozbar &&
cat bozbar-new >bozbar && git update-index --add bozbar &&
git update-index --add bozbar && echo gnusto gnusto >bozbar &&
echo gnusto gnusto >bozbar && read_tree_twoway $treeH $treeM &&
read_tree_twoway $treeH $treeM && git ls-files --stage >19.out &&
git ls-files --stage >19.out && test_cmp M.out 19.out &&
test_cmp M.out 19.out && check_cache_at bozbar dirty
check_cache_at bozbar dirty' '


test_expect_success \ test_expect_success '20 - no local change, use new tree.' '
'20 - no local change, use new tree.' \ rm -f .git/index &&
'rm -f .git/index && read_tree_must_succeed $treeH &&
read_tree_must_succeed $treeH && git checkout-index -u -f -q -a &&
git checkout-index -u -f -q -a && cat bozbar-old >bozbar &&
cat bozbar-old >bozbar && git update-index --add bozbar &&
git update-index --add bozbar && read_tree_twoway $treeH $treeM &&
read_tree_twoway $treeH $treeM && git ls-files --stage >20.out &&
git ls-files --stage >20.out && test_cmp M.out 20.out &&
test_cmp M.out 20.out && check_cache_at bozbar dirty
check_cache_at bozbar dirty' '


test_expect_success \ test_expect_success '21 - no local change, dirty cache.' '
'21 - no local change, dirty cache.' \ rm -f .git/index &&
'rm -f .git/index && read_tree_must_succeed $treeH &&
read_tree_must_succeed $treeH && git checkout-index -u -f -q -a &&
git checkout-index -u -f -q -a && cat bozbar-old >bozbar &&
cat bozbar-old >bozbar && git update-index --add bozbar &&
git update-index --add bozbar && echo gnusto gnusto >bozbar &&
echo gnusto gnusto >bozbar && if read_tree_twoway $treeH $treeM; then false; else :; fi
if read_tree_twoway $treeH $treeM; then false; else :; fi' '


# This fails with straight two-way fast-forward. # This fails with straight two-way fast-forward.
test_expect_success \ test_expect_success '22 - local change cache updated.' '
'22 - local change cache updated.' \ rm -f .git/index &&
'rm -f .git/index && read_tree_must_succeed $treeH &&
read_tree_must_succeed $treeH && git checkout-index -u -f -q -a &&
git checkout-index -u -f -q -a && sed -e "s/such as/SUCH AS/" bozbar-old >bozbar &&
sed -e "s/such as/SUCH AS/" bozbar-old >bozbar && git update-index --add bozbar &&
git update-index --add bozbar && if read_tree_twoway $treeH $treeM; then false; else :; fi
if read_tree_twoway $treeH $treeM; then false; else :; fi' '


# 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) && echo treeDF $treeDF &&
echo treeDF $treeDF && git ls-tree $treeDF &&
git ls-tree $treeDF &&


rm -f DF && rm -f DF &&
mkdir DF && mkdir DF &&
echo DF/DF >DF/DF && echo DF/DF >DF/DF &&
git update-index --add --remove DF DF/DF && git update-index --add --remove DF DF/DF &&
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_twoway $treeDF $treeDFDF &&
read_tree_twoway $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 dirty &&
check_cache_at DF/DF dirty && :
:' '


test_expect_success \ test_expect_success 'a/b (untracked) vs a case setup.' '
'a/b (untracked) vs a case setup.' \ rm -f .git/index &&
'rm -f .git/index && : >a &&
: >a && git update-index --add a &&
git update-index --add a && treeM=$(git write-tree) &&
treeM=$(git write-tree) && echo treeM $treeM &&
echo treeM $treeM && git ls-tree $treeM &&
git ls-tree $treeM && git ls-files --stage >treeM.out &&
git ls-files --stage >treeM.out &&


rm -f a && rm -f a &&
git update-index --remove a && git update-index --remove a &&
mkdir a && mkdir a &&
: >a/b && : >a/b &&
treeH=$(git write-tree) && treeH=$(git write-tree) &&
echo treeH $treeH && echo treeH $treeH &&
git ls-tree $treeH' git ls-tree $treeH
'


test_expect_success \ test_expect_success 'a/b (untracked) vs a, plus c/d case test.' '
'a/b (untracked) vs a, plus c/d case test.' \ read_tree_u_must_fail -u -m "$treeH" "$treeM" &&
'read_tree_u_must_fail -u -m "$treeH" "$treeM" && git ls-files --stage &&
git ls-files --stage && test -f a/b
test -f a/b' '


test_expect_success \ test_expect_success 'a/b vs a, plus c/d case setup.' '
'a/b vs a, plus c/d case setup.' \ rm -f .git/index &&
'rm -f .git/index && rm -fr a &&
rm -fr a && : >a &&
: >a && mkdir c &&
mkdir c && : >c/d &&
: >c/d && git update-index --add a c/d &&
git update-index --add a c/d && treeM=$(git write-tree) &&
treeM=$(git write-tree) && echo treeM $treeM &&
echo treeM $treeM && git ls-tree $treeM &&
git ls-tree $treeM && git ls-files --stage >treeM.out &&
git ls-files --stage >treeM.out &&


rm -f a && rm -f a &&
mkdir a && mkdir a &&
: >a/b && : >a/b &&
git update-index --add --remove a a/b && git update-index --add --remove a a/b &&
treeH=$(git write-tree) && treeH=$(git write-tree) &&
echo treeH $treeH && echo treeH $treeH &&
git ls-tree $treeH' git ls-tree $treeH
'


test_expect_success \ test_expect_success 'a/b vs a, plus c/d case test.' '
'a/b vs a, plus c/d case test.' \ read_tree_u_must_succeed -u -m "$treeH" "$treeM" &&
'read_tree_u_must_succeed -u -m "$treeH" "$treeM" && git ls-files --stage | tee >treeMcheck.out &&
git ls-files --stage | tee >treeMcheck.out && test_cmp treeM.out treeMcheck.out
test_cmp treeM.out treeMcheck.out' '


test_expect_success '-m references the correct modified tree' ' test_expect_success '-m references the correct modified tree' '
echo >file-a && echo >file-a &&