undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t/lib-read-tree-m-3way: modernize style

Browse Source 
Many invocations of the test_expect_success command in this
file are written in old style where the command, an optional
prerequisite, and the test title are written on separate
lines, and the executable script string begins on its own
line, and these lines are pasted together with backslashes
as necessary.

An invocation of the test_expect_success command in modern
test scripts however writes the prerequisite and the title
on the same line as the test_expect_success command itself,
and ends the line with a single quote that begins the
executable script string.

Update the style for uniformity.

Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Shaoxuan Yuan 2022-02-02 14:42:59 +08:00 committed by Junio C Hamano
parent 4c53a8c20f
commit ddea5719fa
1 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
t/lib-read-tree-m-3way.sh
View File

@ -8,16 +8,16 @@ do
p=$a$b p=$a$b
echo This is $p from the original tree. >$p echo This is $p from the original tree. >$p
echo This is Z/$p from the original tree. >Z/$p echo This is Z/$p from the original tree. >Z/$p
test_expect_success \ test_expect_success "adding test file $p and Z/$p" '
"adding test file $p and Z/$p" \ git update-index --add $p &&
'git update-index --add $p && git update-index --add Z/$p
git update-index --add Z/$p' '
done done
done done
echo This is SS from the original tree. >SS echo This is SS from the original tree. >SS
test_expect_success \ test_expect_success 'adding test file SS' '
'adding test file SS' \ git update-index --add SS
'git update-index --add SS' '
cat >TT <<\EOF cat >TT <<\EOF
This is a trivial merge sample text. This is a trivial merge sample text.
Branch A is expected to upcase this word, here. Branch A is expected to upcase this word, here.
@ -30,12 +30,12 @@ At the very end, here comes another line, that is
the word, expected to be upcased by Branch B. the word, expected to be upcased by Branch B.
This concludes the trivial merge sample file. This concludes the trivial merge sample file.
EOF EOF
test_expect_success \ test_expect_success 'adding test file TT' '
'adding test file TT' \ git update-index --add TT
'git update-index --add TT' '
test_expect_success \ test_expect_success 'prepare initial tree' '
'prepare initial tree' \ tree_O=$(git write-tree)
'tree_O=$(git write-tree)' '
################################################################ ################################################################
# Branch A and B makes the changes according to the above matrix. # Branch A and B makes the changes according to the above matrix.
@ -45,48 +45,48 @@ test_expect_success \
to_remove=$(echo D? Z/D?) to_remove=$(echo D? Z/D?)
rm -f $to_remove rm -f $to_remove
test_expect_success \ test_expect_success 'change in branch A (removal)' '
'change in branch A (removal)' \ git update-index --remove $to_remove
'git update-index --remove $to_remove' '
for p in M? Z/M? for p in M? Z/M?
do do
echo This is modified $p in the branch A. >$p echo This is modified $p in the branch A. >$p
test_expect_success \ test_expect_success 'change in branch A (modification)' '
'change in branch A (modification)' \ git update-index $p
"git update-index $p" '
done done
for p in AN AA Z/AN Z/AA for p in AN AA Z/AN Z/AA
do do
echo This is added $p in the branch A. >$p echo This is added $p in the branch A. >$p
test_expect_success \ test_expect_success 'change in branch A (addition)' '
'change in branch A (addition)' \ git update-index --add $p
"git update-index --add $p" '
done done
echo This is SS from the modified tree. >SS echo This is SS from the modified tree. >SS
echo This is LL from the modified tree. >LL echo This is LL from the modified tree. >LL
test_expect_success \ test_expect_success 'change in branch A (addition)' '
'change in branch A (addition)' \ git update-index --add LL &&
'git update-index --add LL && git update-index SS
git update-index SS' '
mv TT TT- mv TT TT-
sed -e '/Branch A/s/word/WORD/g' <TT- >TT sed -e '/Branch A/s/word/WORD/g' <TT- >TT
rm -f TT- rm -f TT-
test_expect_success \ test_expect_success 'change in branch A (edit)' '
'change in branch A (edit)' \ git update-index TT
'git update-index TT' '
mkdir DF mkdir DF
echo Branch A makes a file at DF/DF, creating a directory DF. >DF/DF echo Branch A makes a file at DF/DF, creating a directory DF. >DF/DF
test_expect_success \ test_expect_success 'change in branch A (change file to directory)' '
'change in branch A (change file to directory)' \ git update-index --add DF/DF
'git update-index --add DF/DF' '
test_expect_success \ test_expect_success 'recording branch A tree' '
'recording branch A tree' \ tree_A=$(git write-tree)
'tree_A=$(git write-tree)' '
################################################################ ################################################################
# Branch B # Branch B
@ -94,65 +94,65 @@ test_expect_success \
rm -rf [NDMASLT][NDMASLT] Z DF rm -rf [NDMASLT][NDMASLT] Z DF
mkdir Z mkdir Z
test_expect_success \ test_expect_success 'reading original tree and checking out' '
'reading original tree and checking out' \ git read-tree $tree_O &&
'git read-tree $tree_O && git checkout-index -a
git checkout-index -a' '
to_remove=$(echo ?D Z/?D) to_remove=$(echo ?D Z/?D)
rm -f $to_remove rm -f $to_remove
test_expect_success \ test_expect_success 'change in branch B (removal)' '
'change in branch B (removal)' \ git update-index --remove $to_remove
"git update-index --remove $to_remove" '
for p in ?M Z/?M for p in ?M Z/?M
do do
echo This is modified $p in the branch B. >$p echo This is modified $p in the branch B. >$p
test_expect_success \ test_expect_success 'change in branch B (modification)' '
'change in branch B (modification)' \ git update-index $p
"git update-index $p" '
done done
for p in NA AA Z/NA Z/AA for p in NA AA Z/NA Z/AA
do do
echo This is added $p in the branch B. >$p echo This is added $p in the branch B. >$p
test_expect_success \ test_expect_success 'change in branch B (addition)' '
'change in branch B (addition)' \ git update-index --add $p
"git update-index --add $p" '
done done
echo This is SS from the modified tree. >SS echo This is SS from the modified tree. >SS
echo This is LL from the modified tree. >LL echo This is LL from the modified tree. >LL
test_expect_success \ test_expect_success 'change in branch B (addition and modification)' '
'change in branch B (addition and modification)' \ git update-index --add LL &&
'git update-index --add LL && git update-index SS
git update-index SS' '
mv TT TT- mv TT TT-
sed -e '/Branch B/s/word/WORD/g' <TT- >TT sed -e '/Branch B/s/word/WORD/g' <TT- >TT
rm -f TT- rm -f TT-
test_expect_success \ test_expect_success 'change in branch B (modification)' '
'change in branch B (modification)' \ git update-index TT
'git update-index TT' '
echo Branch B makes a file at DF. >DF echo Branch B makes a file at DF. >DF
test_expect_success \ test_expect_success 'change in branch B (addition of a file to conflict with directory)' '
'change in branch B (addition of a file to conflict with directory)' \ git update-index --add DF
'git update-index --add DF' '
test_expect_success \ test_expect_success 'recording branch B tree' '
'recording branch B tree' \ tree_B=$(git write-tree)
'tree_B=$(git write-tree)' '
test_expect_success \ test_expect_success 'keep contents of 3 trees for easy access' '
'keep contents of 3 trees for easy access' \ rm -f .git/index &&
'rm -f .git/index && git read-tree $tree_O &&
git read-tree $tree_O && mkdir .orig-O &&
mkdir .orig-O && git checkout-index --prefix=.orig-O/ -f -q -a &&
git checkout-index --prefix=.orig-O/ -f -q -a && rm -f .git/index &&
rm -f .git/index && git read-tree $tree_A &&
git read-tree $tree_A && mkdir .orig-A &&
mkdir .orig-A && git checkout-index --prefix=.orig-A/ -f -q -a &&
git checkout-index --prefix=.orig-A/ -f -q -a && rm -f .git/index &&
rm -f .git/index && git read-tree $tree_B &&
git read-tree $tree_B && mkdir .orig-B &&
mkdir .orig-B && git checkout-index --prefix=.orig-B/ -f -q -a
git checkout-index --prefix=.orig-B/ -f -q -a' '