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 <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthew Ogilvie committed
Nov 28, 2009 at 11:38 UTC
5d59a4016bdc068cd49e2a1c43caf4fa59896391
4 files changed
+16
-16
t/t3409-rebase-preserve-merges.sh
+3
-3
@@ -32,14 +32,14 @@ export GIT_AUTHOR_EMAIL
32
test_expect_success 'setup for merge-preserving rebase' \
33
'echo First > A &&
34
git add A &&
35
- git-commit -m "Add A1" &&
35
+ git commit -m "Add A1" &&
36
git checkout -b topic &&
37
echo Second > B &&
38
git add B &&
39
- git-commit -m "Add B1" &&
39
+ git commit -m "Add B1" &&
40
git checkout -f master &&
41
echo Third >> A &&
42
- git-commit -a -m "Modify A2" &&
42
+ git commit -a -m "Modify A2" &&
43
44
git clone ./. clone1 &&
45
cd clone1 &&
t/t4107-apply-ignore-whitespace.sh
+10
-10
@@ -136,37 +136,37 @@ void print_int(int num) {
136
EOF
137
138
test_expect_success 'file creation' '
139
- git-apply patch1.patch
139
+ git apply patch1.patch
140
'
141
142
test_expect_success 'patch2 fails (retab)' '
143
- test_must_fail git-apply patch2.patch
143
+ test_must_fail git apply patch2.patch
144
'
145
146
test_expect_success 'patch2 applies with --ignore-whitespace' '
147
- git-apply --ignore-whitespace patch2.patch
147
+ git apply --ignore-whitespace patch2.patch
148
'
149
150
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
152
'
153
154
git config apply.ignorewhitespace change
155
156
test_expect_success 'patch2 applies (apply.ignorewhitespace = change)' '
157
- git-apply patch2.patch
157
+ git apply patch2.patch
158
'
159
160
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
162
'
163
164
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
166
'
167
168
test_expect_success 'patch5 applies (leading whitespace)' '
169
- git-apply patch5.patch
169
+ git apply patch5.patch
170
'
171
172
test_expect_success 'patches do not mangle whitespace' '
@@ -175,11 +175,11 @@ test_expect_success 'patches do not mangle whitespace' '
175
176
test_expect_success 're-create file (with --ignore-whitespace)' '
177
rm -f main.c &&
178
- git-apply patch1.patch
178
+ git apply patch1.patch
179
'
180
181
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
183
'
184
185
test_done
t/t7406-submodule-update.sh
+2
-2
@@ -14,8 +14,8 @@ submodule and "git submodule update --rebase/--merge" does not detach the HEAD.
14
15
compare_head()
16
{
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`
19
20
test "$sha_master" = "$sha_head"
21
}
t/t9150-svk-mergetickets.sh
+1
-1
@@ -18,7 +18,7 @@ test_expect_success 'load svk depot' "
18
uuid=b48289b2-9c08-4d72-af37-0358a40b9c15
19
20
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 ]
22
"
23
24
test_done