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

Merge branch 'sy/modernize-t-lib-read-tree-m-3way' 

Style updates on a test script helper.

* sy/modernize-t-lib-read-tree-m-3way:
  t/lib-read-tree-m-3way: indent with tabs
  t/lib-read-tree-m-3way: modernize style
maint
Junio C Hamano 2022-02-17 16:25:05 -08:00
parent a4ec347888 cd26cd6c7c
commit 6cfe518967
1 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,21 +3,21 @@
mkdir Z mkdir Z
for a in N D M for a in N D M
do do
for b in N D M for b in N D M
do 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' '