Skip to content

Commit a76d906

Browse files
Shubhamlmpgitster
Shubhamlmp
authored and
gitster
committed
t7001: indent with TABs instead of spaces
Signed-off-by: Shubham Verma <[email protected]> Reviewed-by: Eric Sunshine <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5712d62 commit a76d906

File tree

1 file changed

+60
-60
lines changed

1 file changed

+60
-60
lines changed

‎t/t7001-mv.sh

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -4,72 +4,72 @@ test_description='git mv in subdirs'
44
. ./test-lib.sh
55

66
test_expect_success 'prepare reference tree' '
7-
mkdir path0 path1 &&
8-
cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
9-
git add path0/COPYING &&
10-
git commit -m add -a
7+
mkdir path0 path1 &&
8+
cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
9+
git add path0/COPYING &&
10+
git commit -m add -a
1111
'
1212

1313
test_expect_success 'moving the file out of subdirectory' '
14-
cd path0 && git mv COPYING ../path1/COPYING
14+
cd path0 && git mv COPYING ../path1/COPYING
1515
'
1616

1717
# in path0 currently
1818
test_expect_success 'commiting the change' '
19-
cd .. && git commit -m move-out -a
19+
cd .. && git commit -m move-out -a
2020
'
2121

2222
test_expect_success 'checking the commit' '
23-
git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
24-
grep "^R100..*path0/COPYING..*path1/COPYING" actual
23+
git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
24+
grep "^R100..*path0/COPYING..*path1/COPYING" actual
2525
'
2626

2727
test_expect_success 'moving the file back into subdirectory' '
28-
cd path0 && git mv ../path1/COPYING COPYING
28+
cd path0 && git mv ../path1/COPYING COPYING
2929
'
3030

3131
# in path0 currently
3232
test_expect_success 'commiting the change' '
33-
cd .. && git commit -m move-in -a
33+
cd .. && git commit -m move-in -a
3434
'
3535

3636
test_expect_success 'checking the commit' '
37-
git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
38-
grep "^R100..*path1/COPYING..*path0/COPYING" actual
37+
git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
38+
grep "^R100..*path1/COPYING..*path0/COPYING" actual
3939
'
4040

4141
test_expect_success 'mv --dry-run does not move file' '
42-
git mv -n path0/COPYING MOVED &&
43-
test -f path0/COPYING &&
44-
test ! -f MOVED
42+
git mv -n path0/COPYING MOVED &&
43+
test -f path0/COPYING &&
44+
test ! -f MOVED
4545
'
4646

4747
test_expect_success 'checking -k on non-existing file' '
48-
git mv -k idontexist path0
48+
git mv -k idontexist path0
4949
'
5050

5151
test_expect_success 'checking -k on untracked file' '
52-
touch untracked1 &&
53-
git mv -k untracked1 path0 &&
54-
test -f untracked1 &&
55-
test ! -f path0/untracked1
52+
touch untracked1 &&
53+
git mv -k untracked1 path0 &&
54+
test -f untracked1 &&
55+
test ! -f path0/untracked1
5656
'
5757

5858
test_expect_success 'checking -k on multiple untracked files' '
59-
touch untracked2 &&
60-
git mv -k untracked1 untracked2 path0 &&
61-
test -f untracked1 &&
62-
test -f untracked2 &&
63-
test ! -f path0/untracked1 &&
64-
test ! -f path0/untracked2
59+
touch untracked2 &&
60+
git mv -k untracked1 untracked2 path0 &&
61+
test -f untracked1 &&
62+
test -f untracked2 &&
63+
test ! -f path0/untracked1 &&
64+
test ! -f path0/untracked2
6565
'
6666

6767
test_expect_success 'checking -f on untracked file with existing target' '
68-
touch path0/untracked1 &&
69-
test_must_fail git mv -f untracked1 path0 &&
70-
test ! -f .git/index.lock &&
71-
test -f untracked1 &&
72-
test -f path0/untracked1
68+
touch path0/untracked1 &&
69+
test_must_fail git mv -f untracked1 path0 &&
70+
test ! -f .git/index.lock &&
71+
test -f untracked1 &&
72+
test -f path0/untracked1
7373
'
7474

7575
# clean up the mess in case bad things happen
@@ -79,77 +79,77 @@ rm -f idontexist untracked1 untracked2 \
7979
rmdir path1
8080

8181
test_expect_success 'moving to absent target with trailing slash' '
82-
test_must_fail git mv path0/COPYING no-such-dir/ &&
83-
test_must_fail git mv path0/COPYING no-such-dir// &&
84-
git mv path0/ no-such-dir/ &&
85-
test_path_is_dir no-such-dir
82+
test_must_fail git mv path0/COPYING no-such-dir/ &&
83+
test_must_fail git mv path0/COPYING no-such-dir// &&
84+
git mv path0/ no-such-dir/ &&
85+
test_path_is_dir no-such-dir
8686
'
8787

8888
test_expect_success 'clean up' '
89-
git reset --hard
89+
git reset --hard
9090
'
9191

9292
test_expect_success 'moving to existing untracked target with trailing slash' '
93-
mkdir path1 &&
94-
git mv path0/ path1/ &&
95-
test_path_is_dir path1/path0/
93+
mkdir path1 &&
94+
git mv path0/ path1/ &&
95+
test_path_is_dir path1/path0/
9696
'
9797

9898
test_expect_success 'moving to existing tracked target with trailing slash' '
99-
mkdir path2 &&
100-
>path2/file && git add path2/file &&
101-
git mv path1/path0/ path2/ &&
102-
test_path_is_dir path2/path0/
99+
mkdir path2 &&
100+
>path2/file && git add path2/file &&
101+
git mv path1/path0/ path2/ &&
102+
test_path_is_dir path2/path0/
103103
'
104104

105105
test_expect_success 'clean up' '
106-
git reset --hard
106+
git reset --hard
107107
'
108108

109109
test_expect_success 'adding another file' '
110-
cp "$TEST_DIRECTORY"/../README.md path0/README &&
111-
git add path0/README &&
112-
git commit -m add2 -a
110+
cp "$TEST_DIRECTORY"/../README.md path0/README &&
111+
git add path0/README &&
112+
git commit -m add2 -a
113113
'
114114

115115
test_expect_success 'moving whole subdirectory' '
116-
git mv path0 path2
116+
git mv path0 path2
117117
'
118118

119119
test_expect_success 'commiting the change' '
120-
git commit -m dir-move -a
120+
git commit -m dir-move -a
121121
'
122122

123123
test_expect_success 'checking the commit' '
124-
git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
125-
grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
126-
grep "^R100..*path0/README..*path2/README" actual
124+
git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
125+
grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
126+
grep "^R100..*path0/README..*path2/README" actual
127127
'
128128

129129
test_expect_success 'succeed when source is a prefix of destination' '
130-
git mv path2/COPYING path2/COPYING-renamed
130+
git mv path2/COPYING path2/COPYING-renamed
131131
'
132132

133133
test_expect_success 'moving whole subdirectory into subdirectory' '
134-
git mv path2 path1
134+
git mv path2 path1
135135
'
136136

137137
test_expect_success 'commiting the change' '
138-
git commit -m dir-move -a
138+
git commit -m dir-move -a
139139
'
140140

141141
test_expect_success 'checking the commit' '
142-
git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
143-
grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
144-
grep "^R100..*path2/README..*path1/path2/README" actual
142+
git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
143+
grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
144+
grep "^R100..*path2/README..*path1/path2/README" actual
145145
'
146146

147147
test_expect_success 'do not move directory over existing directory' '
148-
mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0
148+
mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0
149149
'
150150

151151
test_expect_success 'move into "."' '
152-
git mv path1/path2/ .
152+
git mv path1/path2/ .
153153
'
154154

155155
test_expect_success "Michael Cassar's test case" '

0 commit comments

Comments
 (0)