Skip to content

Commit d592b31

Browse files
Nanako Shiraishigitster
Nanako Shiraishi
authored and
gitster
committed
tests: use "git xyzzy" form (t7000 - t7199)
Converts tests between t7001-t7103. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 3604e7c commit d592b31

File tree

6 files changed

+183
-183
lines changed

6 files changed

+183
-183
lines changed

‎t/t7001-mv.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ test_expect_success \
88
'mkdir path0 path1 &&
99
cp ../../COPYING path0/COPYING &&
1010
git add path0/COPYING &&
11-
git-commit -m add -a'
11+
git commit -m add -a'
1212

1313
test_expect_success \
1414
'moving the file out of subdirectory' \
@@ -17,7 +17,7 @@ test_expect_success \
1717
# in path0 currently
1818
test_expect_success \
1919
'commiting the change' \
20-
'cd .. && git-commit -m move-out -a'
20+
'cd .. && git commit -m move-out -a'
2121

2222
test_expect_success \
2323
'checking the commit' \
@@ -31,7 +31,7 @@ test_expect_success \
3131
# in path0 currently
3232
test_expect_success \
3333
'commiting the change' \
34-
'cd .. && git-commit -m move-in -a'
34+
'cd .. && git commit -m move-in -a'
3535

3636
test_expect_success \
3737
'checking the commit' \
@@ -42,15 +42,15 @@ test_expect_success \
4242
'adding another file' \
4343
'cp ../../README path0/README &&
4444
git add path0/README &&
45-
git-commit -m add2 -a'
45+
git commit -m add2 -a'
4646

4747
test_expect_success \
4848
'moving whole subdirectory' \
4949
'git mv path0 path2'
5050

5151
test_expect_success \
5252
'commiting the change' \
53-
'git-commit -m dir-move -a'
53+
'git commit -m dir-move -a'
5454

5555
test_expect_success \
5656
'checking the commit' \
@@ -69,7 +69,7 @@ test_expect_success \
6969

7070
test_expect_success \
7171
'commiting the change' \
72-
'git-commit -m dir-move -a'
72+
'git commit -m dir-move -a'
7373

7474
test_expect_success \
7575
'checking the commit' \

‎t/t7003-filter-branch.sh‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
test_description='git-filter-branch'
3+
test_description='git filter-branch'
44
. ./test-lib.sh
55

66
make_commit () {
@@ -32,22 +32,22 @@ test_expect_success 'setup' '
3232
H=$(git rev-parse H)
3333

3434
test_expect_success 'rewrite identically' '
35-
git-filter-branch branch
35+
git filter-branch branch
3636
'
3737
test_expect_success 'result is really identical' '
3838
test $H = $(git rev-parse HEAD)
3939
'
4040

4141
test_expect_success 'rewrite bare repository identically' '
42-
(git config core.bare true && cd .git && git-filter-branch branch)
42+
(git config core.bare true && cd .git && git filter-branch branch)
4343
'
4444
git config core.bare false
4545
test_expect_success 'result is really identical' '
4646
test $H = $(git rev-parse HEAD)
4747
'
4848

4949
test_expect_success 'rewrite, renaming a specific file' '
50-
git-filter-branch -f --tree-filter "mv d doh || :" HEAD
50+
git filter-branch -f --tree-filter "mv d doh || :" HEAD
5151
'
5252

5353
test_expect_success 'test that the file was renamed' '
@@ -58,7 +58,7 @@ test_expect_success 'test that the file was renamed' '
5858
'
5959

6060
test_expect_success 'rewrite, renaming a specific directory' '
61-
git-filter-branch -f --tree-filter "mv dir diroh || :" HEAD
61+
git filter-branch -f --tree-filter "mv dir diroh || :" HEAD
6262
'
6363

6464
test_expect_success 'test that the directory was renamed' '
@@ -73,7 +73,7 @@ test_expect_success 'test that the directory was renamed' '
7373
git tag oldD HEAD~4
7474
test_expect_success 'rewrite one branch, keeping a side branch' '
7575
git branch modD oldD &&
76-
git-filter-branch -f --tree-filter "mv b boh || :" D..modD
76+
git filter-branch -f --tree-filter "mv b boh || :" D..modD
7777
'
7878

7979
test_expect_success 'common ancestor is still common (unchanged)' '
@@ -96,7 +96,7 @@ test_expect_success 'filter subdirectory only' '
9696
test_tick &&
9797
git commit -m "again not subdir" &&
9898
git branch sub &&
99-
git-filter-branch -f --subdirectory-filter subdir refs/heads/sub
99+
git filter-branch -f --subdirectory-filter subdir refs/heads/sub
100100
'
101101

102102
test_expect_success 'subdirectory filter result looks okay' '
@@ -120,7 +120,7 @@ test_expect_success 'more setup' '
120120

121121
test_expect_success 'use index-filter to move into a subdirectory' '
122122
git branch directorymoved &&
123-
git-filter-branch -f --index-filter \
123+
git filter-branch -f --index-filter \
124124
"git ls-files -s | sed \"s-\\t-&newsubdir/-\" |
125125
GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
126126
git update-index --index-info &&
@@ -129,7 +129,7 @@ test_expect_success 'use index-filter to move into a subdirectory' '
129129

130130
test_expect_success 'stops when msg filter fails' '
131131
old=$(git rev-parse HEAD) &&
132-
test_must_fail git-filter-branch -f --msg-filter false HEAD &&
132+
test_must_fail git filter-branch -f --msg-filter false HEAD &&
133133
test $old = $(git rev-parse HEAD) &&
134134
rm -rf .git-rewrite
135135
'
@@ -140,7 +140,7 @@ test_expect_success 'author information is preserved' '
140140
test_tick &&
141141
GIT_AUTHOR_NAME="B V Uips" git commit -m bvuips &&
142142
git branch preserved-author &&
143-
git-filter-branch -f --msg-filter "cat; \
143+
git filter-branch -f --msg-filter "cat; \
144144
test \$GIT_COMMIT != $(git rev-parse master) || \
145145
echo Hallo" \
146146
preserved-author &&
@@ -152,7 +152,7 @@ test_expect_success "remove a certain author's commits" '
152152
test_tick &&
153153
git commit -m i i &&
154154
git branch removed-author &&
155-
git-filter-branch -f --commit-filter "\
155+
git filter-branch -f --commit-filter "\
156156
if [ \"\$GIT_AUTHOR_NAME\" = \"B V Uips\" ];\
157157
then\
158158
skip_commit \"\$@\";

0 commit comments

Comments
 (0)