Skip to content

Commit 5d59a40

Browse files
Matthew Ogilviegitster
authored andcommitted
t3409 t4107 t7406 t9150: use dashless commands
This is needed to allow test suite to run against a standard install bin directory instead of GIT_EXEC_PATH. Signed-off-by: Matthew Ogilvie <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 42ac496 commit 5d59a40

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

t/t3409-rebase-preserve-merges.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ export GIT_AUTHOR_EMAIL
3232
test_expect_success 'setup for merge-preserving rebase' \
3333
'echo First > A &&
3434
git add A &&
35-
git-commit -m "Add A1" &&
35+
git commit -m "Add A1" &&
3636
git checkout -b topic &&
3737
echo Second > B &&
3838
git add B &&
39-
git-commit -m "Add B1" &&
39+
git commit -m "Add B1" &&
4040
git checkout -f master &&
4141
echo Third >> A &&
42-
git-commit -a -m "Modify A2" &&
42+
git commit -a -m "Modify A2" &&
4343
4444
git clone ./. clone1 &&
4545
cd clone1 &&

t/t4107-apply-ignore-whitespace.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,37 +136,37 @@ void print_int(int num) {
136136
EOF
137137

138138
test_expect_success 'file creation' '
139-
git-apply patch1.patch
139+
git apply patch1.patch
140140
'
141141

142142
test_expect_success 'patch2 fails (retab)' '
143-
test_must_fail git-apply patch2.patch
143+
test_must_fail git apply patch2.patch
144144
'
145145

146146
test_expect_success 'patch2 applies with --ignore-whitespace' '
147-
git-apply --ignore-whitespace patch2.patch
147+
git apply --ignore-whitespace patch2.patch
148148
'
149149

150150
test_expect_success 'patch2 reverse applies with --ignore-space-change' '
151-
git-apply -R --ignore-space-change patch2.patch
151+
git apply -R --ignore-space-change patch2.patch
152152
'
153153

154154
git config apply.ignorewhitespace change
155155

156156
test_expect_success 'patch2 applies (apply.ignorewhitespace = change)' '
157-
git-apply patch2.patch
157+
git apply patch2.patch
158158
'
159159

160160
test_expect_success 'patch3 fails (missing string at EOL)' '
161-
test_must_fail git-apply patch3.patch
161+
test_must_fail git apply patch3.patch
162162
'
163163

164164
test_expect_success 'patch4 fails (missing EOL at EOF)' '
165-
test_must_fail git-apply patch4.patch
165+
test_must_fail git apply patch4.patch
166166
'
167167

168168
test_expect_success 'patch5 applies (leading whitespace)' '
169-
git-apply patch5.patch
169+
git apply patch5.patch
170170
'
171171

172172
test_expect_success 'patches do not mangle whitespace' '
@@ -175,11 +175,11 @@ test_expect_success 'patches do not mangle whitespace' '
175175

176176
test_expect_success 're-create file (with --ignore-whitespace)' '
177177
rm -f main.c &&
178-
git-apply patch1.patch
178+
git apply patch1.patch
179179
'
180180

181181
test_expect_success 'patch5 fails (--no-ignore-whitespace)' '
182-
test_must_fail git-apply --no-ignore-whitespace patch5.patch
182+
test_must_fail git apply --no-ignore-whitespace patch5.patch
183183
'
184184

185185
test_done

t/t7406-submodule-update.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ submodule and "git submodule update --rebase/--merge" does not detach the HEAD.
1414

1515
compare_head()
1616
{
17-
sha_master=`git-rev-list --max-count=1 master`
18-
sha_head=`git-rev-list --max-count=1 HEAD`
17+
sha_master=`git rev-list --max-count=1 master`
18+
sha_head=`git rev-list --max-count=1 HEAD`
1919

2020
test "$sha_master" = "$sha_head"
2121
}

t/t9150-svk-mergetickets.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ test_expect_success 'load svk depot' "
1818
uuid=b48289b2-9c08-4d72-af37-0358a40b9c15
1919

2020
test_expect_success 'svk merges were represented coming in' "
21-
[ `git-cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
21+
[ `git cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
2222
"
2323

2424
test_done

0 commit comments

Comments
 (0)