summaryrefslogtreecommitdiff
path: root/t/lib-read-tree-m-3way.sh
diff options
context:
space:
mode:
authorLibravatar Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>2022-02-02 14:43:00 +0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-02-02 11:32:58 -0800
commitcd26cd6c7c0f6c26a5328c95a667844c27ea3fd0 (patch)
tree270fbb906b00e3f8c9005e90a3605a44435de81f /t/lib-read-tree-m-3way.sh
parentt/lib-read-tree-m-3way: modernize style (diff)
downloadtgif-cd26cd6c7c0f6c26a5328c95a667844c27ea3fd0.tar.xz
t/lib-read-tree-m-3way: indent with tabs
As Documentation/CodingGuidelines says, our shell scripts (including tests) are to use HT for indentation, but this script uses 4-column indent with SP. Fix this. Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-read-tree-m-3way.sh')
-rw-r--r--t/lib-read-tree-m-3way.sh96
1 files changed, 48 insertions, 48 deletions
diff --git a/t/lib-read-tree-m-3way.sh b/t/lib-read-tree-m-3way.sh
index 2bf43850be..2da25b3144 100644
--- a/t/lib-read-tree-m-3way.sh
+++ b/t/lib-read-tree-m-3way.sh
@@ -3,9 +3,9 @@
mkdir Z
for a in N D M
do
- for b in N D M
- do
- p=$a$b
+ for b in N D M
+ do
+ p=$a$b
echo This is $p from the original tree. >$p
echo This is Z/$p from the original tree. >Z/$p
test_expect_success "adding test file $p and Z/$p" '
@@ -16,7 +16,7 @@ do
done
echo This is SS from the original tree. >SS
test_expect_success 'adding test file SS' '
- git update-index --add SS
+ git update-index --add SS
'
cat >TT <<\EOF
This is a trivial merge sample text.
@@ -31,10 +31,10 @@ the word, expected to be upcased by Branch B.
This concludes the trivial merge sample file.
EOF
test_expect_success 'adding test file TT' '
- git update-index --add TT
+ git update-index --add TT
'
test_expect_success 'prepare initial tree' '
- tree_O=$(git write-tree)
+ tree_O=$(git write-tree)
'
################################################################
@@ -46,46 +46,46 @@ test_expect_success 'prepare initial tree' '
to_remove=$(echo D? Z/D?)
rm -f $to_remove
test_expect_success 'change in branch A (removal)' '
- git update-index --remove $to_remove
+ git update-index --remove $to_remove
'
for p in M? Z/M?
do
- echo This is modified $p in the branch A. >$p
- test_expect_success 'change in branch A (modification)' '
- git update-index $p
- '
+ echo This is modified $p in the branch A. >$p
+ test_expect_success 'change in branch A (modification)' '
+ git update-index $p
+ '
done
for p in AN AA Z/AN Z/AA
do
- echo This is added $p in the branch A. >$p
- test_expect_success 'change in branch A (addition)' '
- git update-index --add $p
- '
+ echo This is added $p in the branch A. >$p
+ test_expect_success 'change in branch A (addition)' '
+ git update-index --add $p
+ '
done
echo This is SS from the modified tree. >SS
echo This is LL from the modified tree. >LL
test_expect_success 'change in branch A (addition)' '
- git update-index --add LL &&
- git update-index SS
+ git update-index --add LL &&
+ git update-index SS
'
mv TT TT-
sed -e '/Branch A/s/word/WORD/g' <TT- >TT
rm -f TT-
test_expect_success 'change in branch A (edit)' '
- git update-index TT
+ git update-index TT
'
mkdir DF
echo Branch A makes a file at DF/DF, creating a directory DF. >DF/DF
test_expect_success 'change in branch A (change file to directory)' '
- git update-index --add DF/DF
+ git update-index --add DF/DF
'
test_expect_success 'recording branch A tree' '
- tree_A=$(git write-tree)
+ tree_A=$(git write-tree)
'
################################################################
@@ -95,64 +95,64 @@ test_expect_success 'recording branch A tree' '
rm -rf [NDMASLT][NDMASLT] Z DF
mkdir Z
test_expect_success 'reading original tree and checking out' '
- git read-tree $tree_O &&
- git checkout-index -a
+ git read-tree $tree_O &&
+ git checkout-index -a
'
to_remove=$(echo ?D Z/?D)
rm -f $to_remove
test_expect_success 'change in branch B (removal)' '
- git update-index --remove $to_remove
+ git update-index --remove $to_remove
'
for p in ?M Z/?M
do
- echo This is modified $p in the branch B. >$p
- test_expect_success 'change in branch B (modification)' '
- git update-index $p
- '
+ echo This is modified $p in the branch B. >$p
+ test_expect_success 'change in branch B (modification)' '
+ git update-index $p
+ '
done
for p in NA AA Z/NA Z/AA
do
- echo This is added $p in the branch B. >$p
- test_expect_success 'change in branch B (addition)' '
- git update-index --add $p
- '
+ echo This is added $p in the branch B. >$p
+ test_expect_success 'change in branch B (addition)' '
+ git update-index --add $p
+ '
done
echo This is SS from the modified tree. >SS
echo This is LL from the modified tree. >LL
test_expect_success 'change in branch B (addition and modification)' '
- git update-index --add LL &&
- git update-index SS
+ git update-index --add LL &&
+ git update-index SS
'
mv TT TT-
sed -e '/Branch B/s/word/WORD/g' <TT- >TT
rm -f TT-
test_expect_success 'change in branch B (modification)' '
- git update-index TT
+ git update-index TT
'
echo Branch B makes a file at DF. >DF
test_expect_success '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 'recording branch B tree' '
- tree_B=$(git write-tree)
+ tree_B=$(git write-tree)
'
test_expect_success 'keep contents of 3 trees for easy access' '
- rm -f .git/index &&
- git read-tree $tree_O &&
- mkdir .orig-O &&
- git checkout-index --prefix=.orig-O/ -f -q -a &&
- rm -f .git/index &&
- git read-tree $tree_A &&
- mkdir .orig-A &&
- git checkout-index --prefix=.orig-A/ -f -q -a &&
- rm -f .git/index &&
- git read-tree $tree_B &&
- mkdir .orig-B &&
- git checkout-index --prefix=.orig-B/ -f -q -a
+ rm -f .git/index &&
+ git read-tree $tree_O &&
+ mkdir .orig-O &&
+ git checkout-index --prefix=.orig-O/ -f -q -a &&
+ rm -f .git/index &&
+ git read-tree $tree_A &&
+ mkdir .orig-A &&
+ git checkout-index --prefix=.orig-A/ -f -q -a &&
+ rm -f .git/index &&
+ git read-tree $tree_B &&
+ mkdir .orig-B &&
+ git checkout-index --prefix=.orig-B/ -f -q -a
'