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

t2004: modernize style 

In particular:

* indent test body
* place test description on same line as test_expect_*
* place closing quote on its own line
* name output file "actual" rather than "out"
* name setup test "setup" rather than "preparation"

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Eric Sunshine 2014-12-24 04:43:12 -05:00 committed by Junio C Hamano
parent 9a8c2b67cd
commit 9fb7b57f82
1 changed files with 180 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

345
t/t2004-checkout-cache-temp.sh
View File

@ -10,202 +10,203 @@ rather than the tracked path.'


. ./test-lib.sh . ./test-lib.sh


test_expect_success \ test_expect_success 'setup' '
'preparation' ' mkdir asubdir &&
mkdir asubdir && echo tree1path0 >path0 &&
echo tree1path0 >path0 && echo tree1path1 >path1 &&
echo tree1path1 >path1 && echo tree1path3 >path3 &&
echo tree1path3 >path3 && echo tree1path4 >path4 &&
echo tree1path4 >path4 && echo tree1asubdir/path5 >asubdir/path5 &&
echo tree1asubdir/path5 >asubdir/path5 && git update-index --add path0 path1 path3 path4 asubdir/path5 &&
git update-index --add path0 path1 path3 path4 asubdir/path5 && t1=$(git write-tree) &&
t1=$(git write-tree) && rm -f path* .merge_* actual .git/index &&
rm -f path* .merge_* out .git/index && echo tree2path0 >path0 &&
echo tree2path0 >path0 && echo tree2path1 >path1 &&
echo tree2path1 >path1 && echo tree2path2 >path2 &&
echo tree2path2 >path2 && echo tree2path4 >path4 &&
echo tree2path4 >path4 && git update-index --add path0 path1 path2 path4 &&
git update-index --add path0 path1 path2 path4 && t2=$(git write-tree) &&
t2=$(git write-tree) && rm -f path* .merge_* actual .git/index &&
rm -f path* .merge_* out .git/index && echo tree2path0 >path0 &&
echo tree2path0 >path0 && echo tree3path1 >path1 &&
echo tree3path1 >path1 && echo tree3path2 >path2 &&
echo tree3path2 >path2 && echo tree3path3 >path3 &&
echo tree3path3 >path3 && git update-index --add path0 path1 path2 path3 &&
git update-index --add path0 path1 path2 path3 && t3=$(git write-tree)
t3=$(git write-tree)' '


test_expect_success \ test_expect_success 'checkout one stage 0 to temporary file' '
'checkout one stage 0 to temporary file' ' rm -f path* .merge_* actual .git/index &&
rm -f path* .merge_* out .git/index && git read-tree $t1 &&
git read-tree $t1 && git checkout-index --temp -- path1 >actual &&
git checkout-index --temp -- path1 >out && test_line_count = 1 actual &&
test_line_count = 1 out && test $(cut "-d " -f2 actual) = path1 &&
test $(cut "-d " -f2 out) = path1 && p=$(cut "-d " -f1 actual) &&
p=$(cut "-d " -f1 out) && test -f $p &&
test -f $p && test $(cat $p) = tree1path1
test $(cat $p) = tree1path1' '


test_expect_success \ test_expect_success 'checkout all stage 0 to temporary files' '
'checkout all stage 0 to temporary files' ' rm -f path* .merge_* actual .git/index &&
rm -f path* .merge_* out .git/index && git read-tree $t1 &&
git read-tree $t1 && git checkout-index -a --temp >actual &&
git checkout-index -a --temp >out && test_line_count = 5 actual &&
test_line_count = 5 out && for f in path0 path1 path3 path4 asubdir/path5
for f in path0 path1 path3 path4 asubdir/path5 do
do test $(grep $f actual | cut "-d " -f2) = $f &&
test $(grep $f out | cut "-d " -f2) = $f && p=$(grep $f actual | cut "-d " -f1) &&
p=$(grep $f out | cut "-d " -f1) &&
test -f $p && test -f $p &&
test $(cat $p) = tree1$f test $(cat $p) = tree1$f
done' done
'


test_expect_success \ test_expect_success 'setup 3-way merge' '
'prepare 3-way merge' ' rm -f path* .merge_* actual .git/index &&
rm -f path* .merge_* out .git/index && git read-tree -m $t1 $t2 $t3
git read-tree -m $t1 $t2 $t3' '


test_expect_success \ test_expect_success 'checkout one stage 2 to temporary file' '
'checkout one stage 2 to temporary file' ' rm -f path* .merge_* actual &&
rm -f path* .merge_* out && git checkout-index --stage=2 --temp -- path1 >actual &&
git checkout-index --stage=2 --temp -- path1 >out && test_line_count = 1 actual &&
test_line_count = 1 out && test $(cut "-d " -f2 actual) = path1 &&
test $(cut "-d " -f2 out) = path1 && p=$(cut "-d " -f1 actual) &&
p=$(cut "-d " -f1 out) && test -f $p &&
test -f $p && test $(cat $p) = tree2path1
test $(cat $p) = tree2path1' '


test_expect_success \ test_expect_success 'checkout all stage 2 to temporary files' '
'checkout all stage 2 to temporary files' ' rm -f path* .merge_* actual &&
rm -f path* .merge_* out && git checkout-index --all --stage=2 --temp >actual &&
git checkout-index --all --stage=2 --temp >out && test_line_count = 3 actual &&
test_line_count = 3 out && for f in path1 path2 path4
for f in path1 path2 path4 do
do test $(grep $f actual | cut "-d " -f2) = $f &&
test $(grep $f out | cut "-d " -f2) = $f && p=$(grep $f actual | cut "-d " -f1) &&
p=$(grep $f out | cut "-d " -f1) &&
test -f $p && test -f $p &&
test $(cat $p) = tree2$f test $(cat $p) = tree2$f
done' done
'


test_expect_success \ test_expect_success 'checkout all stages/one file to nothing' '
'checkout all stages/one file to nothing' ' rm -f path* .merge_* actual &&
rm -f path* .merge_* out && git checkout-index --stage=all --temp -- path0 >actual &&
git checkout-index --stage=all --temp -- path0 >out && test_line_count = 0 actual
test_line_count = 0 out' '


test_expect_success \ test_expect_success 'checkout all stages/one file to temporary files' '
'checkout all stages/one file to temporary files' ' rm -f path* .merge_* actual &&
rm -f path* .merge_* out && git checkout-index --stage=all --temp -- path1 >actual &&
git checkout-index --stage=all --temp -- path1 >out && test_line_count = 1 actual &&
test_line_count = 1 out && test $(cut "-d " -f2 actual) = path1 &&
test $(cut "-d " -f2 out) = path1 && cut "-d " -f1 actual | (read s1 s2 s3 &&
cut "-d " -f1 out | (read s1 s2 s3 && test -f $s1 &&
test -f $s1 && test -f $s2 &&
test -f $s2 && test -f $s3 &&
test -f $s3 && test $(cat $s1) = tree1path1 &&
test $(cat $s1) = tree1path1 && test $(cat $s2) = tree2path1 &&
test $(cat $s2) = tree2path1 && test $(cat $s3) = tree3path1)
test $(cat $s3) = tree3path1)' '


test_expect_success \ test_expect_success 'checkout some stages/one file to temporary files' '
'checkout some stages/one file to temporary files' ' rm -f path* .merge_* actual &&
rm -f path* .merge_* out && git checkout-index --stage=all --temp -- path2 >actual &&
git checkout-index --stage=all --temp -- path2 >out && test_line_count = 1 actual &&
test_line_count = 1 out && test $(cut "-d " -f2 actual) = path2 &&
test $(cut "-d " -f2 out) = path2 && cut "-d " -f1 actual | (read s1 s2 s3 &&
cut "-d " -f1 out | (read s1 s2 s3 && test $s1 = . &&
test $s1 = . && test -f $s2 &&
test -f $s2 && test -f $s3 &&
test -f $s3 && test $(cat $s2) = tree2path2 &&
test $(cat $s2) = tree2path2 && test $(cat $s3) = tree3path2)
test $(cat $s3) = tree3path2)' '


test_expect_success \ test_expect_success 'checkout all stages/all files to temporary files' '
'checkout all stages/all files to temporary files' ' rm -f path* .merge_* actual &&
rm -f path* .merge_* out && git checkout-index -a --stage=all --temp >actual &&
git checkout-index -a --stage=all --temp >out && test_line_count = 5 actual
test_line_count = 5 out' '


test_expect_success \ test_expect_success '-- path0: no entry' '
'-- path0: no entry' ' test x$(grep path0 actual | cut "-d " -f2) = x
test x$(grep path0 out | cut "-d " -f2) = x' '


test_expect_success \ test_expect_success '-- path1: all 3 stages' '
'-- path1: all 3 stages' ' test $(grep path1 actual | cut "-d " -f2) = path1 &&
test $(grep path1 out | cut "-d " -f2) = path1 && grep path1 actual | cut "-d " -f1 | (read s1 s2 s3 &&
grep path1 out | cut "-d " -f1 | (read s1 s2 s3 && test -f $s1 &&
test -f $s1 && test -f $s2 &&
test -f $s2 && test -f $s3 &&
test -f $s3 && test $(cat $s1) = tree1path1 &&
test $(cat $s1) = tree1path1 && test $(cat $s2) = tree2path1 &&
test $(cat $s2) = tree2path1 && test $(cat $s3) = tree3path1)
test $(cat $s3) = tree3path1)' '


test_expect_success \ test_expect_success '-- path2: no stage 1, have stage 2 and 3' '
'-- path2: no stage 1, have stage 2 and 3' ' test $(grep path2 actual | cut "-d " -f2) = path2 &&
test $(grep path2 out | cut "-d " -f2) = path2 && grep path2 actual | cut "-d " -f1 | (read s1 s2 s3 &&
grep path2 out | cut "-d " -f1 | (read s1 s2 s3 && test $s1 = . &&
test $s1 = . && test -f $s2 &&
test -f $s2 && test -f $s3 &&
test -f $s3 && test $(cat $s2) = tree2path2 &&
test $(cat $s2) = tree2path2 && test $(cat $s3) = tree3path2)
test $(cat $s3) = tree3path2)' '


test_expect_success \ test_expect_success '-- path3: no stage 2, have stage 1 and 3' '
'-- path3: no stage 2, have stage 1 and 3' ' test $(grep path3 actual | cut "-d " -f2) = path3 &&
test $(grep path3 out | cut "-d " -f2) = path3 && grep path3 actual | cut "-d " -f1 | (read s1 s2 s3 &&
grep path3 out | cut "-d " -f1 | (read s1 s2 s3 && test -f $s1 &&
test -f $s1 && test $s2 = . &&
test $s2 = . && test -f $s3 &&
test -f $s3 && test $(cat $s1) = tree1path3 &&
test $(cat $s1) = tree1path3 && test $(cat $s3) = tree3path3)
test $(cat $s3) = tree3path3)' '


test_expect_success \ test_expect_success '-- path4: no stage 3, have stage 1 and 3' '
'-- path4: no stage 3, have stage 1 and 3' ' test $(grep path4 actual | cut "-d " -f2) = path4 &&
test $(grep path4 out | cut "-d " -f2) = path4 && grep path4 actual | cut "-d " -f1 | (read s1 s2 s3 &&
grep path4 out | cut "-d " -f1 | (read s1 s2 s3 && test -f $s1 &&
test -f $s1 && test -f $s2 &&
test -f $s2 && test $s3 = . &&
test $s3 = . && test $(cat $s1) = tree1path4 &&
test $(cat $s1) = tree1path4 && test $(cat $s2) = tree2path4)
test $(cat $s2) = tree2path4)' '


test_expect_success \ test_expect_success '-- asubdir/path5: no stage 2 and 3 have stage 1' '
'-- asubdir/path5: no stage 2 and 3 have stage 1' ' test $(grep asubdir/path5 actual | cut "-d " -f2) = asubdir/path5 &&
test $(grep asubdir/path5 out | cut "-d " -f2) = asubdir/path5 && grep asubdir/path5 actual | cut "-d " -f1 | (read s1 s2 s3 &&
grep asubdir/path5 out | cut "-d " -f1 | (read s1 s2 s3 && test -f $s1 &&
test -f $s1 && test $s2 = . &&
test $s2 = . && test $s3 = . &&
test $s3 = . && test $(cat $s1) = tree1asubdir/path5)
test $(cat $s1) = tree1asubdir/path5)' '


test_expect_success \ test_expect_success 'checkout --temp within subdir' '
'checkout --temp within subdir' ' (
(cd asubdir && cd asubdir &&
git checkout-index -a --stage=all >out && git checkout-index -a --stage=all >actual &&
test_line_count = 1 out && test_line_count = 1 actual &&
test $(grep path5 out | cut "-d " -f2) = path5 && test $(grep path5 actual | cut "-d " -f2) = path5 &&
grep path5 out | cut "-d " -f1 | (read s1 s2 s3 && grep path5 actual | cut "-d " -f1 | (read s1 s2 s3 &&
test -f ../$s1 && test -f ../$s1 &&
test $s2 = . && test $s2 = . &&
test $s3 = . && test $s3 = . &&
test $(cat ../$s1) = tree1asubdir/path5) test $(cat ../$s1) = tree1asubdir/path5)
)' )
'


test_expect_success \ test_expect_success 'checkout --temp symlink' '
'checkout --temp symlink' ' rm -f path* .merge_* actual .git/index &&
rm -f path* .merge_* out .git/index && test_ln_s_add b a &&
test_ln_s_add b a && t4=$(git write-tree) &&
t4=$(git write-tree) && rm -f .git/index &&
rm -f .git/index && git read-tree $t4 &&
git read-tree $t4 && git checkout-index --temp -a >actual &&
git checkout-index --temp -a >out && test_line_count = 1 actual &&
test_line_count = 1 out && test $(cut "-d " -f2 actual) = a &&
test $(cut "-d " -f2 out) = a && p=$(cut "-d " -f1 actual) &&
p=$(cut "-d " -f1 out) && test -f $p &&
test -f $p && test $(cat $p) = b
test $(cat $p) = b' '


test_done test_done