From: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
To: shaoxuan.yuan02@gmail.com
Cc: christian.couder@gmail.com, git@vger.kernel.org,
gitster@pobox.com, sunshine@sunshineco.com
Subject: [PATCH v4 2/2] t/lib-read-tree-m-3way: indent with tabs
Date: Tue, 8 Feb 2022 11:24:50 +0800 [thread overview]
Message-ID: <20220208032450.46604-3-shaoxuan.yuan02@gmail.com> (raw)
In-Reply-To: <20220208032450.46604-1-shaoxuan.yuan02@gmail.com>
As Documentation/CodingGuidelines says, our shell scripts
(including tests) are to use tabs for indentation, but this script
uses 4-column indent with space. Fix this.
Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
---
t/lib-read-tree-m-3way.sh | 96 +++++++++++++++++++--------------------
1 file changed, 48 insertions(+), 48 deletions(-)
diff --git a/t/lib-read-tree-m-3way.sh b/t/lib-read-tree-m-3way.sh
index 3c17cb7f80..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
'
--
2.35.1
prev parent reply other threads:[~2022-02-08 3:25 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-23 6:03 [GSoC][PATCH] lib-read-tree-m-3way: modernize a test script (style) Shaoxuan Yuan
2022-01-27 10:54 ` Shaoxuan Yuan
2022-01-28 8:34 ` Eric Sunshine
2022-01-28 9:51 ` Shaoxuan Yuan
2022-02-05 11:59 ` Eric Sunshine
2022-02-07 13:10 ` Shaoxuan Yuan
2022-01-30 9:43 ` [PATCH v2 0/2] t/lib-read-tree-m-3way: modernize a test script Shaoxuan Yuan
2022-01-30 9:43 ` [PATCH v2 1/2] t/lib-read-tree-m-3way: replace double quotes with single quotes Shaoxuan Yuan
2022-02-01 23:51 ` Junio C Hamano
2022-02-02 4:52 ` Shaoxuan Yuan
2022-01-30 9:43 ` [PATCH v2 2/2] t/lib-read-tree-m-3way: replace spaces with tabs Shaoxuan Yuan
2022-02-01 23:57 ` Junio C Hamano
2022-02-02 4:59 ` Shaoxuan Yuan
2022-02-02 6:42 ` [PATCH v3 1/2] t/lib-read-tree-m-3way: modernize style Shaoxuan Yuan
2022-02-02 6:43 ` [PATCH v3 2/2] t/lib-read-tree-m-3way: indent with tabs Shaoxuan Yuan
2022-02-07 11:54 ` Christian Couder
2022-02-08 1:47 ` Shaoxuan Yuan
2022-02-07 11:41 ` [PATCH v3 1/2] t/lib-read-tree-m-3way: modernize style Christian Couder
2022-02-08 1:43 ` Shaoxuan Yuan
2022-02-08 3:24 ` [PATCH v4 0/2] t/lib-read-tree-m-3way: modernize a test script Shaoxuan Yuan
2022-02-08 3:24 ` [PATCH v4 1/2] t/lib-read-tree-m-3way: modernize style Shaoxuan Yuan
2022-02-08 3:24 ` Shaoxuan Yuan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220208032450.46604-3-shaoxuan.yuan02@gmail.com \
--to=shaoxuan.yuan02@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).