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>
Nanako Shiraishi committed
Sep 3, 2008 at 17:59 UTC
d592b3157f70c9dac6288b28c46a64826c0abd18
6 files changed
+183
-183
t/t7001-mv.sh
+6
-6
@@ -8,7 +8,7 @@ test_expect_success \
8
'mkdir path0 path1 &&
9
cp ../../COPYING path0/COPYING &&
10
git add path0/COPYING &&
11
- git-commit -m add -a'
11
+ git commit -m add -a'
12
13
test_expect_success \
14
'moving the file out of subdirectory' \
@@ -17,7 +17,7 @@ test_expect_success \
17
# in path0 currently
18
test_expect_success \
19
'commiting the change' \
20
- 'cd .. && git-commit -m move-out -a'
20
+ 'cd .. && git commit -m move-out -a'
21
22
test_expect_success \
23
'checking the commit' \
@@ -31,7 +31,7 @@ test_expect_success \
31
# in path0 currently
32
test_expect_success \
33
'commiting the change' \
34
- 'cd .. && git-commit -m move-in -a'
34
+ 'cd .. && git commit -m move-in -a'
35
36
test_expect_success \
37
'checking the commit' \
@@ -42,7 +42,7 @@ test_expect_success \
42
'adding another file' \
43
'cp ../../README path0/README &&
44
git add path0/README &&
45
- git-commit -m add2 -a'
45
+ git commit -m add2 -a'
46
47
test_expect_success \
48
'moving whole subdirectory' \
@@ -50,7 +50,7 @@ test_expect_success \
50
51
test_expect_success \
52
'commiting the change' \
53
- 'git-commit -m dir-move -a'
53
+ 'git commit -m dir-move -a'
54
55
test_expect_success \
56
'checking the commit' \
@@ -69,7 +69,7 @@ test_expect_success \
69
70
test_expect_success \
71
'commiting the change' \
72
- 'git-commit -m dir-move -a'
72
+ 'git commit -m dir-move -a'
73
74
test_expect_success \
75
'checking the commit' \
t/t7003-filter-branch.sh
+11
-11
@@ -1,6 +1,6 @@
1
#!/bin/sh
2
3
-test_description='git-filter-branch'
3
+test_description='git filter-branch'
4
. ./test-lib.sh
5
6
make_commit () {
@@ -32,14 +32,14 @@ test_expect_success 'setup' '
32
H=$(git rev-parse H)
33
34
test_expect_success 'rewrite identically' '
35
- git-filter-branch branch
35
+ git filter-branch branch
36
'
37
test_expect_success 'result is really identical' '
38
test $H = $(git rev-parse HEAD)
39
'
40
41
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)
43
'
44
git config core.bare false
45
test_expect_success 'result is really identical' '
@@ -47,7 +47,7 @@ test_expect_success 'result is really identical' '
47
'
48
49
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
51
'
52
53
test_expect_success 'test that the file was renamed' '
@@ -58,7 +58,7 @@ test_expect_success 'test that the file was renamed' '
58
'
59
60
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
62
'
63
64
test_expect_success 'test that the directory was renamed' '
@@ -73,7 +73,7 @@ test_expect_success 'test that the directory was renamed' '
73
git tag oldD HEAD~4
74
test_expect_success 'rewrite one branch, keeping a side branch' '
75
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
77
'
78
79
test_expect_success 'common ancestor is still common (unchanged)' '
@@ -96,7 +96,7 @@ test_expect_success 'filter subdirectory only' '
96
test_tick &&
97
git commit -m "again not subdir" &&
98
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
100
'
101
102
test_expect_success 'subdirectory filter result looks okay' '
@@ -120,7 +120,7 @@ test_expect_success 'more setup' '
120
121
test_expect_success 'use index-filter to move into a subdirectory' '
122
git branch directorymoved &&
123
- git-filter-branch -f --index-filter \
123
+ git filter-branch -f --index-filter \
124
"git ls-files -s | sed \"s-\\t-&newsubdir/-\" |
125
GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
126
git update-index --index-info &&
@@ -129,7 +129,7 @@ test_expect_success 'use index-filter to move into a subdirectory' '
129
130
test_expect_success 'stops when msg filter fails' '
131
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 &&
133
test $old = $(git rev-parse HEAD) &&
134
rm -rf .git-rewrite
135
'
@@ -140,7 +140,7 @@ test_expect_success 'author information is preserved' '
140
test_tick &&
141
GIT_AUTHOR_NAME="B V Uips" git commit -m bvuips &&
142
git branch preserved-author &&
143
- git-filter-branch -f --msg-filter "cat; \
143
+ git filter-branch -f --msg-filter "cat; \
144
test \$GIT_COMMIT != $(git rev-parse master) || \
145
echo Hallo" \
146
preserved-author &&
@@ -152,7 +152,7 @@ test_expect_success "remove a certain author's commits" '
152
test_tick &&
153
git commit -m i i &&
154
git branch removed-author &&
155
- git-filter-branch -f --commit-filter "\
155
+ git filter-branch -f --commit-filter "\
156
if [ \"\$GIT_AUTHOR_NAME\" = \"B V Uips\" ];\
157
then\
158
skip_commit \"\$@\";
t/t7004-tag.sh
+159
-159
@@ -3,7 +3,7 @@
3
# Copyright (c) 2007 Carlos Rica
4
#
5
6
-test_description='git-tag
6
+test_description='git tag
7
8
Tests for operations with tags.'
9
@@ -22,25 +22,25 @@ test_expect_success 'listing all tags in an empty tree should succeed' '
22
'
23
24
test_expect_success 'listing all tags in an empty tree should output nothing' '
25
- test `git-tag -l | wc -l` -eq 0 &&
26
- test `git-tag | wc -l` -eq 0
25
+ test `git tag -l | wc -l` -eq 0 &&
26
+ test `git tag | wc -l` -eq 0
27
'
28
29
test_expect_success 'looking for a tag in an empty tree should fail' \
30
'! (tag_exists mytag)'
31
32
test_expect_success 'creating a tag in an empty tree should fail' '
33
- test_must_fail git-tag mynotag &&
33
+ test_must_fail git tag mynotag &&
34
! tag_exists mynotag
35
'
36
37
test_expect_success 'creating a tag for HEAD in an empty tree should fail' '
38
- test_must_fail git-tag mytaghead HEAD &&
38
+ test_must_fail git tag mytaghead HEAD &&
39
! tag_exists mytaghead
40
'
41
42
test_expect_success 'creating a tag for an unknown revision should fail' '
43
- test_must_fail git-tag mytagnorev aaaaaaaaaaa &&
43
+ test_must_fail git tag mytagnorev aaaaaaaaaaa &&
44
! tag_exists mytagnorev
45
'
46
@@ -54,32 +54,32 @@ test_expect_success 'creating a tag using default HEAD should succeed' '
54
'
55
56
test_expect_success 'listing all tags if one exists should succeed' '
57
- git-tag -l &&
58
- git-tag
57
+ git tag -l &&
58
+ git tag
59
'
60
61
test_expect_success 'listing all tags if one exists should output that tag' '
62
- test `git-tag -l` = mytag &&
63
- test `git-tag` = mytag
62
+ test `git tag -l` = mytag &&
63
+ test `git tag` = mytag
64
'
65
66
# pattern matching:
67
68
test_expect_success 'listing a tag using a matching pattern should succeed' \
69
- 'git-tag -l mytag'
69
+ 'git tag -l mytag'
70
71
test_expect_success \
72
'listing a tag using a matching pattern should output that tag' \
73
- 'test `git-tag -l mytag` = mytag'
73
+ 'test `git tag -l mytag` = mytag'
74
75
# todo: git tag -l now returns always zero, when fixed, change this test
76
test_expect_success \
77
'listing tags using a non-matching pattern should suceed' \
78
- 'git-tag -l xxx'
78
+ 'git tag -l xxx'
79
80
test_expect_success \
81
'listing tags using a non-matching pattern should output nothing' \
82
- 'test `git-tag -l xxx | wc -l` -eq 0'
82
+ 'test `git tag -l xxx | wc -l` -eq 0'
83
84
# special cases for creating tags:
85
@@ -89,13 +89,13 @@ test_expect_success \
89
90
test_expect_success \
91
'trying to create a tag with a non-valid name should fail' '
92
- test `git-tag -l | wc -l` -eq 1 &&
92
+ test `git tag -l | wc -l` -eq 1 &&
93
test_must_fail git tag "" &&
94
test_must_fail git tag .othertag &&
95
test_must_fail git tag "other tag" &&
96
test_must_fail git tag "othertag^" &&
97
test_must_fail git tag "other~tag" &&
98
- test `git-tag -l | wc -l` -eq 1
98
+ test `git tag -l | wc -l` -eq 1
99
'
100
101
test_expect_success 'creating a tag using HEAD directly should succeed' '
@@ -107,7 +107,7 @@ test_expect_success 'creating a tag using HEAD directly should succeed' '
107
108
test_expect_success 'trying to delete an unknown tag should fail' '
109
! tag_exists unknown-tag &&
110
- test_must_fail git-tag -d unknown-tag
110
+ test_must_fail git tag -d unknown-tag
111
'
112
113
cat >expect <<EOF
@@ -117,7 +117,7 @@ EOF
117
test_expect_success \
118
'trying to delete tags without params should succeed and do nothing' '
119
git tag -l > actual && test_cmp expect actual &&
120
- git-tag -d &&
120
+ git tag -d &&
121
git tag -l > actual && test_cmp expect actual
122
'
123
@@ -125,7 +125,7 @@ test_expect_success \
125
'deleting two existing tags in one command should succeed' '
126
tag_exists mytag &&
127
tag_exists myhead &&
128
- git-tag -d mytag myhead &&
128
+ git tag -d mytag myhead &&
129
! tag_exists mytag &&
130
! tag_exists myhead
131
'
@@ -133,7 +133,7 @@ test_expect_success \
133
test_expect_success \
134
'creating a tag with the name of another deleted one should succeed' '
135
! tag_exists mytag &&
136
- git-tag mytag &&
136
+ git tag mytag &&
137
tag_exists mytag
138
'
139
@@ -141,13 +141,13 @@ test_expect_success \
141
'trying to delete two tags, existing and not, should fail in the 2nd' '
142
tag_exists mytag &&
143
! tag_exists myhead &&
144
- test_must_fail git-tag -d mytag anothertag &&
144
+ test_must_fail git tag -d mytag anothertag &&
145
! tag_exists mytag &&
146
! tag_exists myhead
147
'
148
149
test_expect_success 'trying to delete an already deleted tag should fail' \
150
- 'test_must_fail git-tag -d mytag'
150
+ 'test_must_fail git tag -d mytag'
151
152
# listing various tags with pattern matching:
153
@@ -185,7 +185,7 @@ cba
185
EOF
186
test_expect_success \
187
'listing tags with substring as pattern must print those matching' '
188
- git-tag -l "*a*" > actual &&
188
+ git tag -l "*a*" > actual &&
189
test_cmp expect actual
190
'
191
@@ -195,7 +195,7 @@ v1.0.1
195
EOF
196
test_expect_success \
197
'listing tags with a suffix as pattern must print those matching' '
198
- git-tag -l "*.1" > actual &&
198
+ git tag -l "*.1" > actual &&
199
test_cmp expect actual
200
'
201
@@ -205,7 +205,7 @@ t211
205
EOF
206
test_expect_success \
207
'listing tags with a prefix as pattern must print those matching' '
208
- git-tag -l "t21*" > actual &&
208
+ git tag -l "t21*" > actual &&
209
test_cmp expect actual
210
'
211
@@ -214,7 +214,7 @@ a1
214
EOF
215
test_expect_success \
216
'listing tags using a name as pattern must print that one matching' '
217
- git-tag -l a1 > actual &&
217
+ git tag -l a1 > actual &&
218
test_cmp expect actual
219
'
220
@@ -223,7 +223,7 @@ v1.0
223
EOF
224
test_expect_success \
225
'listing tags using a name as pattern must print that one matching' '
226
- git-tag -l v1.0 > actual &&
226
+ git tag -l v1.0 > actual &&
227
test_cmp expect actual
228
'
229
@@ -233,14 +233,14 @@ v1.1.3
233
EOF
234
test_expect_success \
235
'listing tags with ? in the pattern should print those matching' '
236
- git-tag -l "v1.?.?" > actual &&
236
+ git tag -l "v1.?.?" > actual &&
237
test_cmp expect actual
238
'
239
240
>expect
241
test_expect_success \
242
'listing tags using v.* should print nothing because none have v.' '
243
- git-tag -l "v.*" > actual &&
243
+ git tag -l "v.*" > actual &&
244
test_cmp expect actual
245
'
246
@@ -252,7 +252,7 @@ v1.1.3
252
EOF
253
test_expect_success \
254
'listing tags using v* should print only those having v' '
255
- git-tag -l "v*" > actual &&
255
+ git tag -l "v*" > actual &&
256
test_cmp expect actual
257
'
258
@@ -260,21 +260,21 @@ test_expect_success \
260
261
test_expect_success \
262
'a non-annotated tag created without parameters should point to HEAD' '
263
- git-tag non-annotated-tag &&
263
+ git tag non-annotated-tag &&
264
test $(git cat-file -t non-annotated-tag) = commit &&
265
test $(git rev-parse non-annotated-tag) = $(git rev-parse HEAD)
266
'
267
268
test_expect_success 'trying to verify an unknown tag should fail' \
269
- 'test_must_fail git-tag -v unknown-tag'
269
+ 'test_must_fail git tag -v unknown-tag'
270
271
test_expect_success \
272
'trying to verify a non-annotated and non-signed tag should fail' \
273
- 'test_must_fail git-tag -v non-annotated-tag'
273
+ 'test_must_fail git tag -v non-annotated-tag'
274
275
test_expect_success \
276
'trying to verify many non-annotated or unknown tags, should fail' \
277
- 'test_must_fail git-tag -v unknown-tag1 non-annotated-tag unknown-tag2'
277
+ 'test_must_fail git tag -v unknown-tag1 non-annotated-tag unknown-tag2'
278
279
# creating annotated tags:
280
@@ -300,7 +300,7 @@ get_tag_header annotated-tag $commit commit $time >expect
300
echo "A message" >>expect
301
test_expect_success \
302
'creating an annotated tag with -m message should succeed' '
303
- git-tag -m "A message" annotated-tag &&
303
+ git tag -m "A message" annotated-tag &&
304
get_tag_msg annotated-tag >actual &&
305
test_cmp expect actual
306
'
@@ -313,7 +313,7 @@ get_tag_header file-annotated-tag $commit commit $time >expect
313
cat msgfile >>expect
314
test_expect_success \
315
'creating an annotated tag with -F messagefile should succeed' '
316
- git-tag -F msgfile file-annotated-tag &&
316
+ git tag -F msgfile file-annotated-tag &&
317
get_tag_msg file-annotated-tag >actual &&
318
test_cmp expect actual
319
'
@@ -325,7 +325,7 @@ EOF
325
get_tag_header stdin-annotated-tag $commit commit $time >expect
326
cat inputmsg >>expect
327
test_expect_success 'creating an annotated tag with -F - should succeed' '
328
- git-tag -F - stdin-annotated-tag <inputmsg &&
328
+ git tag -F - stdin-annotated-tag <inputmsg &&
329
get_tag_msg stdin-annotated-tag >actual &&
330
test_cmp expect actual
331
'
@@ -334,7 +334,7 @@ test_expect_success \
334
'trying to create a tag with a non-existing -F file should fail' '
335
! test -f nonexistingfile &&
336
! tag_exists notag &&
337
- test_must_fail git-tag -F nonexistingfile notag &&
337
+ test_must_fail git tag -F nonexistingfile notag &&
338
! tag_exists notag
339
'
340
@@ -343,11 +343,11 @@ test_expect_success \
343
echo "message file 1" >msgfile1 &&
344
echo "message file 2" >msgfile2 &&
345
! tag_exists msgtag &&
346
- test_must_fail git-tag -m "message 1" -F msgfile1 msgtag &&
346
+ test_must_fail git tag -m "message 1" -F msgfile1 msgtag &&
347
! tag_exists msgtag &&
348
- test_must_fail git-tag -F msgfile1 -m "message 1" msgtag &&
348
+ test_must_fail git tag -F msgfile1 -m "message 1" msgtag &&
349
! tag_exists msgtag &&
350
- test_must_fail git-tag -m "message 1" -F msgfile1 \
350
+ test_must_fail git tag -m "message 1" -F msgfile1 \
351
-m "message 2" msgtag &&
352
! tag_exists msgtag
353
'
@@ -357,7 +357,7 @@ test_expect_success \
357
get_tag_header empty-annotated-tag $commit commit $time >expect
358
test_expect_success \
359
'creating a tag with an empty -m message should succeed' '
360
- git-tag -m "" empty-annotated-tag &&
360
+ git tag -m "" empty-annotated-tag &&
361
get_tag_msg empty-annotated-tag >actual &&
362
test_cmp expect actual
363
'
@@ -366,7 +366,7 @@ test_expect_success \
366
get_tag_header emptyfile-annotated-tag $commit commit $time >expect
367
test_expect_success \
368
'creating a tag with an empty -F messagefile should succeed' '
369
- git-tag -F emptyfile emptyfile-annotated-tag &&
369
+ git tag -F emptyfile emptyfile-annotated-tag &&
370
get_tag_msg emptyfile-annotated-tag >actual &&
371
test_cmp expect actual
372
'
@@ -387,7 +387,7 @@ Trailing blank lines
387
EOF
388
test_expect_success \
389
'extra blanks in the message for an annotated tag should be removed' '
390
- git-tag -F blanksfile blanks-annotated-tag &&
390
+ git tag -F blanksfile blanks-annotated-tag &&
391
get_tag_msg blanks-annotated-tag >actual &&
392
test_cmp expect actual
393
'
@@ -395,7 +395,7 @@ test_expect_success \
395
get_tag_header blank-annotated-tag $commit commit $time >expect
396
test_expect_success \
397
'creating a tag with blank -m message with spaces should succeed' '
398
- git-tag -m " " blank-annotated-tag &&
398
+ git tag -m " " blank-annotated-tag &&
399
get_tag_msg blank-annotated-tag >actual &&
400
test_cmp expect actual
401
'
@@ -406,7 +406,7 @@ echo ' ' >>blankfile
406
get_tag_header blankfile-annotated-tag $commit commit $time >expect
407
test_expect_success \
408
'creating a tag with blank -F messagefile with spaces should succeed' '
409
- git-tag -F blankfile blankfile-annotated-tag &&
409
+ git tag -F blankfile blankfile-annotated-tag &&
410
get_tag_msg blankfile-annotated-tag >actual &&
411
test_cmp expect actual
412
'
@@ -415,7 +415,7 @@ printf ' ' >blanknonlfile
415
get_tag_header blanknonlfile-annotated-tag $commit commit $time >expect
416
test_expect_success \
417
'creating a tag with -F file of spaces and no newline should succeed' '
418
- git-tag -F blanknonlfile blanknonlfile-annotated-tag &&
418
+ git tag -F blanknonlfile blanknonlfile-annotated-tag &&
419
get_tag_msg blanknonlfile-annotated-tag >actual &&
420
test_cmp expect actual
421
'
@@ -450,7 +450,7 @@ Last line.
450
EOF
451
test_expect_success \
452
'creating a tag using a -F messagefile with #comments should succeed' '
453
- git-tag -F commentsfile comments-annotated-tag &&
453
+ git tag -F commentsfile comments-annotated-tag &&
454
get_tag_msg comments-annotated-tag >actual &&
455
test_cmp expect actual
456
'
@@ -458,7 +458,7 @@ test_expect_success \
458
get_tag_header comment-annotated-tag $commit commit $time >expect
459
test_expect_success \
460
'creating a tag with a #comment in the -m message should succeed' '
461
- git-tag -m "#comment" comment-annotated-tag &&
461
+ git tag -m "#comment" comment-annotated-tag &&
462
get_tag_msg comment-annotated-tag >actual &&
463
test_cmp expect actual
464
'
@@ -469,7 +469,7 @@ echo '####' >>commentfile
469
get_tag_header commentfile-annotated-tag $commit commit $time >expect
470
test_expect_success \
471
'creating a tag with #comments in the -F messagefile should succeed' '
472
- git-tag -F commentfile commentfile-annotated-tag &&
472
+ git tag -F commentfile commentfile-annotated-tag &&
473
get_tag_msg commentfile-annotated-tag >actual &&
474
test_cmp expect actual
475
'
@@ -478,7 +478,7 @@ printf '#comment' >commentnonlfile
478
get_tag_header commentnonlfile-annotated-tag $commit commit $time >expect
479
test_expect_success \
480
'creating a tag with a file of #comment and no newline should succeed' '
481
- git-tag -F commentnonlfile commentnonlfile-annotated-tag &&
481
+ git tag -F commentnonlfile commentnonlfile-annotated-tag &&
482
get_tag_msg commentnonlfile-annotated-tag >actual &&
483
test_cmp expect actual
484
'
@@ -487,51 +487,51 @@ test_expect_success \
487
488
test_expect_success \
489
'listing the one-line message of a non-signed tag should succeed' '
490
- git-tag -m "A msg" tag-one-line &&
490
+ git tag -m "A msg" tag-one-line &&
491
492
echo "tag-one-line" >expect &&
493
- git-tag -l | grep "^tag-one-line" >actual &&
493
+ git tag -l | grep "^tag-one-line" >actual &&
494
test_cmp expect actual &&
495
- git-tag -n0 -l | grep "^tag-one-line" >actual &&
495
+ git tag -n0 -l | grep "^tag-one-line" >actual &&
496
test_cmp expect actual &&
497
- git-tag -n0 -l tag-one-line >actual &&
497
+ git tag -n0 -l tag-one-line >actual &&
498
test_cmp expect actual &&
499
500
echo "tag-one-line A msg" >expect &&
501
- git-tag -n1 -l | grep "^tag-one-line" >actual &&
501
+ git tag -n1 -l | grep "^tag-one-line" >actual &&
502
test_cmp expect actual &&
503
- git-tag -n -l | grep "^tag-one-line" >actual &&
503
+ git tag -n -l | grep "^tag-one-line" >actual &&
504
test_cmp expect actual &&
505
- git-tag -n1 -l tag-one-line >actual &&
505
+ git tag -n1 -l tag-one-line >actual &&
506
test_cmp expect actual &&
507
- git-tag -n2 -l tag-one-line >actual &&
507
+ git tag -n2 -l tag-one-line >actual &&
508
test_cmp expect actual &&
509
- git-tag -n999 -l tag-one-line >actual &&
509
+ git tag -n999 -l tag-one-line >actual &&
510
test_cmp expect actual
511
'
512
513
test_expect_success \
514
'listing the zero-lines message of a non-signed tag should succeed' '
515
- git-tag -m "" tag-zero-lines &&
515
+ git tag -m "" tag-zero-lines &&
516
517
echo "tag-zero-lines" >expect &&
518
- git-tag -l | grep "^tag-zero-lines" >actual &&
518
+ git tag -l | grep "^tag-zero-lines" >actual &&
519
test_cmp expect actual &&
520
- git-tag -n0 -l | grep "^tag-zero-lines" >actual &&
520
+ git tag -n0 -l | grep "^tag-zero-lines" >actual &&
521
test_cmp expect actual &&
522
- git-tag -n0 -l tag-zero-lines >actual &&
522
+ git tag -n0 -l tag-zero-lines >actual &&
523
test_cmp expect actual &&
524
525
echo "tag-zero-lines " >expect &&
526
- git-tag -n1 -l | grep "^tag-zero-lines" >actual &&
526
+ git tag -n1 -l | grep "^tag-zero-lines" >actual &&
527
test_cmp expect actual &&
528
- git-tag -n -l | grep "^tag-zero-lines" >actual &&
528
+ git tag -n -l | grep "^tag-zero-lines" >actual &&
529
test_cmp expect actual &&
530
- git-tag -n1 -l tag-zero-lines >actual &&
530
+ git tag -n1 -l tag-zero-lines >actual &&
531
test_cmp expect actual &&
532
- git-tag -n2 -l tag-zero-lines >actual &&
532
+ git tag -n2 -l tag-zero-lines >actual &&
533
test_cmp expect actual &&
534
- git-tag -n999 -l tag-zero-lines >actual &&
534
+ git tag -n999 -l tag-zero-lines >actual &&
535
test_cmp expect actual
536
'
537
@@ -540,42 +540,42 @@ echo 'tag line two' >>annotagmsg
540
echo 'tag line three' >>annotagmsg
541
test_expect_success \
542
'listing many message lines of a non-signed tag should succeed' '
543
- git-tag -F annotagmsg tag-lines &&
543
+ git tag -F annotagmsg tag-lines &&
544
545
echo "tag-lines" >expect &&
546
- git-tag -l | grep "^tag-lines" >actual &&
546
+ git tag -l | grep "^tag-lines" >actual &&
547
test_cmp expect actual &&
548
- git-tag -n0 -l | grep "^tag-lines" >actual &&
548
+ git tag -n0 -l | grep "^tag-lines" >actual &&
549
test_cmp expect actual &&
550
- git-tag -n0 -l tag-lines >actual &&
550
+ git tag -n0 -l tag-lines >actual &&
551
test_cmp expect actual &&
552
553
echo "tag-lines tag line one" >expect &&
554
- git-tag -n1 -l | grep "^tag-lines" >actual &&
554
+ git tag -n1 -l | grep "^tag-lines" >actual &&
555
test_cmp expect actual &&
556
- git-tag -n -l | grep "^tag-lines" >actual &&
556
+ git tag -n -l | grep "^tag-lines" >actual &&
557
test_cmp expect actual &&
558
- git-tag -n1 -l tag-lines >actual &&
558
+ git tag -n1 -l tag-lines >actual &&
559
test_cmp expect actual &&
560
561
echo " tag line two" >>expect &&
562
- git-tag -n2 -l | grep "^ *tag.line" >actual &&
562
+ git tag -n2 -l | grep "^ *tag.line" >actual &&
563
test_cmp expect actual &&
564
- git-tag -n2 -l tag-lines >actual &&
564
+ git tag -n2 -l tag-lines >actual &&
565
test_cmp expect actual &&
566
567
echo " tag line three" >>expect &&
568
- git-tag -n3 -l | grep "^ *tag.line" >actual &&
568
+ git tag -n3 -l | grep "^ *tag.line" >actual &&
569
test_cmp expect actual &&
570
- git-tag -n3 -l tag-lines >actual &&
570
+ git tag -n3 -l tag-lines >actual &&
571
test_cmp expect actual &&
572
- git-tag -n4 -l | grep "^ *tag.line" >actual &&
572
+ git tag -n4 -l | grep "^ *tag.line" >actual &&
573
test_cmp expect actual &&
574
- git-tag -n4 -l tag-lines >actual &&
574
+ git tag -n4 -l tag-lines >actual &&
575
test_cmp expect actual &&
576
- git-tag -n99 -l | grep "^ *tag.line" >actual &&
576
+ git tag -n99 -l | grep "^ *tag.line" >actual &&
577
test_cmp expect actual &&
578
- git-tag -n99 -l tag-lines >actual &&
578
+ git tag -n99 -l tag-lines >actual &&
579
test_cmp expect actual
580
'
581
@@ -592,19 +592,19 @@ fi
592
test_expect_success \
593
'trying to verify an annotated non-signed tag should fail' '
594
tag_exists annotated-tag &&
595
- test_must_fail git-tag -v annotated-tag
595
+ test_must_fail git tag -v annotated-tag
596
'
597
598
test_expect_success \
599
'trying to verify a file-annotated non-signed tag should fail' '
600
tag_exists file-annotated-tag &&
601
- test_must_fail git-tag -v file-annotated-tag
601
+ test_must_fail git tag -v file-annotated-tag
602
'
603
604
test_expect_success \
605
'trying to verify two annotated non-signed tags should fail' '
606
tag_exists annotated-tag file-annotated-tag &&
607
- test_must_fail git-tag -v annotated-tag file-annotated-tag
607
+ test_must_fail git tag -v annotated-tag file-annotated-tag
608
'
609
610
# creating and verifying signed tags:
@@ -634,7 +634,7 @@ get_tag_header signed-tag $commit commit $time >expect
634
echo 'A signed tag message' >>expect
635
echo '-----BEGIN PGP SIGNATURE-----' >>expect
636
test_expect_success 'creating a signed tag with -m message should succeed' '
637
- git-tag -s -m "A signed tag message" signed-tag &&
637
+ git tag -s -m "A signed tag message" signed-tag &&
638
get_tag_msg signed-tag >actual &&
639
test_cmp expect actual
640
'
@@ -675,7 +675,7 @@ get_tag_header implied-sign $commit commit $time >expect
675
./fakeeditor >>expect
676
echo '-----BEGIN PGP SIGNATURE-----' >>expect
677
test_expect_success '-u implies signed tag' '
678
- GIT_EDITOR=./fakeeditor git-tag -u CDDE430D implied-sign &&
678
+ GIT_EDITOR=./fakeeditor git tag -u CDDE430D implied-sign &&
679
get_tag_msg implied-sign >actual &&
680
test_cmp expect actual
681
'
@@ -689,7 +689,7 @@ cat sigmsgfile >>expect
689
echo '-----BEGIN PGP SIGNATURE-----' >>expect
690
test_expect_success \
691
'creating a signed tag with -F messagefile should succeed' '
692
- git-tag -s -F sigmsgfile file-signed-tag &&
692
+ git tag -s -F sigmsgfile file-signed-tag &&
693
get_tag_msg file-signed-tag >actual &&
694
test_cmp expect actual
695
'
@@ -702,7 +702,7 @@ get_tag_header stdin-signed-tag $commit commit $time >expect
702
cat siginputmsg >>expect
703
echo '-----BEGIN PGP SIGNATURE-----' >>expect
704
test_expect_success 'creating a signed tag with -F - should succeed' '
705
- git-tag -s -F - stdin-signed-tag <siginputmsg &&
705
+ git tag -s -F - stdin-signed-tag <siginputmsg &&
706
get_tag_msg stdin-signed-tag >actual &&
707
test_cmp expect actual
708
'
@@ -711,7 +711,7 @@ get_tag_header implied-annotate $commit commit $time >expect
711
./fakeeditor >>expect
712
echo '-----BEGIN PGP SIGNATURE-----' >>expect
713
test_expect_success '-s implies annotated tag' '
714
- GIT_EDITOR=./fakeeditor git-tag -s implied-annotate &&
714
+ GIT_EDITOR=./fakeeditor git tag -s implied-annotate &&
715
get_tag_msg implied-annotate >actual &&
716
test_cmp expect actual
717
'
@@ -720,23 +720,23 @@ test_expect_success \
720
'trying to create a signed tag with non-existing -F file should fail' '
721
! test -f nonexistingfile &&
722
! tag_exists nosigtag &&
723
- test_must_fail git-tag -s -F nonexistingfile nosigtag &&
723
+ test_must_fail git tag -s -F nonexistingfile nosigtag &&
724
! tag_exists nosigtag
725
'
726
727
test_expect_success 'verifying a signed tag should succeed' \
728
- 'git-tag -v signed-tag'
728
+ 'git tag -v signed-tag'
729
730
test_expect_success 'verifying two signed tags in one command should succeed' \
731
- 'git-tag -v signed-tag file-signed-tag'
731
+ 'git tag -v signed-tag file-signed-tag'
732
733
test_expect_success \
734
'verifying many signed and non-signed tags should fail' '
735
- test_must_fail git-tag -v signed-tag annotated-tag &&
736
- test_must_fail git-tag -v file-annotated-tag file-signed-tag &&
737
- test_must_fail git-tag -v annotated-tag \
735
+ test_must_fail git tag -v signed-tag annotated-tag &&
736
+ test_must_fail git tag -v file-annotated-tag file-signed-tag &&
737
+ test_must_fail git tag -v annotated-tag \
738
file-signed-tag file-annotated-tag &&
739
- test_must_fail git-tag -v signed-tag annotated-tag file-signed-tag
739
+ test_must_fail git tag -v signed-tag annotated-tag file-signed-tag
740
'
741
742
test_expect_success 'verifying a forged tag should fail' '
@@ -744,7 +744,7 @@ test_expect_success 'verifying a forged tag should fail' '
744
sed -e "s/signed-tag/forged-tag/" |
745
git mktag) &&
746
git tag forged-tag $forged &&
747
- test_must_fail git-tag -v forged-tag
747
+ test_must_fail git tag -v forged-tag
748
'
749
750
# blank and empty messages for signed tags:
@@ -753,10 +753,10 @@ get_tag_header empty-signed-tag $commit commit $time >expect
753
echo '-----BEGIN PGP SIGNATURE-----' >>expect
754
test_expect_success \
755
'creating a signed tag with an empty -m message should succeed' '
756
- git-tag -s -m "" empty-signed-tag &&
756
+ git tag -s -m "" empty-signed-tag &&
757
get_tag_msg empty-signed-tag >actual &&
758
test_cmp expect actual &&
759
- git-tag -v empty-signed-tag
759
+ git tag -v empty-signed-tag
760
'
761
762
>sigemptyfile
@@ -764,10 +764,10 @@ get_tag_header emptyfile-signed-tag $commit commit $time >expect
764
echo '-----BEGIN PGP SIGNATURE-----' >>expect
765
test_expect_success \
766
'creating a signed tag with an empty -F messagefile should succeed' '
767
- git-tag -s -F sigemptyfile emptyfile-signed-tag &&
767
+ git tag -s -F sigemptyfile emptyfile-signed-tag &&
768
get_tag_msg emptyfile-signed-tag >actual &&
769
test_cmp expect actual &&
770
- git-tag -v emptyfile-signed-tag
770
+ git tag -v emptyfile-signed-tag
771
'
772
773
printf '\n\n \n\t\nLeading blank lines\n' > sigblanksfile
@@ -787,20 +787,20 @@ EOF
787
echo '-----BEGIN PGP SIGNATURE-----' >>expect
788
test_expect_success \
789
'extra blanks in the message for a signed tag should be removed' '
790
- git-tag -s -F sigblanksfile blanks-signed-tag &&
790
+ git tag -s -F sigblanksfile blanks-signed-tag &&
791
get_tag_msg blanks-signed-tag >actual &&
792
test_cmp expect actual &&
793
- git-tag -v blanks-signed-tag
793
+ git tag -v blanks-signed-tag
794
'
795
796
get_tag_header blank-signed-tag $commit commit $time >expect
797
echo '-----BEGIN PGP SIGNATURE-----' >>expect
798
test_expect_success \
799
'creating a signed tag with a blank -m message should succeed' '
800
- git-tag -s -m " " blank-signed-tag &&
800
+ git tag -s -m " " blank-signed-tag &&
801
get_tag_msg blank-signed-tag >actual &&
802
test_cmp expect actual &&
803
- git-tag -v blank-signed-tag
803
+ git tag -v blank-signed-tag
804
'
805
806
echo ' ' >sigblankfile
@@ -810,10 +810,10 @@ get_tag_header blankfile-signed-tag $commit commit $time >expect
810
echo '-----BEGIN PGP SIGNATURE-----' >>expect
811
test_expect_success \
812
'creating a signed tag with blank -F file with spaces should succeed' '
813
- git-tag -s -F sigblankfile blankfile-signed-tag &&
813
+ git tag -s -F sigblankfile blankfile-signed-tag &&
814
get_tag_msg blankfile-signed-tag >actual &&
815
test_cmp expect actual &&
816
- git-tag -v blankfile-signed-tag
816
+ git tag -v blankfile-signed-tag
817
'
818
819
printf ' ' >sigblanknonlfile
@@ -821,10 +821,10 @@ get_tag_header blanknonlfile-signed-tag $commit commit $time >expect
821
echo '-----BEGIN PGP SIGNATURE-----' >>expect
822
test_expect_success \
823
'creating a signed tag with spaces and no newline should succeed' '
824
- git-tag -s -F sigblanknonlfile blanknonlfile-signed-tag &&
824
+ git tag -s -F sigblanknonlfile blanknonlfile-signed-tag &&
825
get_tag_msg blanknonlfile-signed-tag >actual &&
826
test_cmp expect actual &&
827
- git-tag -v signed-tag
827
+ git tag -v signed-tag
828
'
829
830
# messages with commented lines for signed tags:
@@ -858,20 +858,20 @@ EOF
858
echo '-----BEGIN PGP SIGNATURE-----' >>expect
859
test_expect_success \
860
'creating a signed tag with a -F file with #comments should succeed' '
861
- git-tag -s -F sigcommentsfile comments-signed-tag &&
861
+ git tag -s -F sigcommentsfile comments-signed-tag &&
862
get_tag_msg comments-signed-tag >actual &&
863
test_cmp expect actual &&
864
- git-tag -v comments-signed-tag
864
+ git tag -v comments-signed-tag
865
'
866
867
get_tag_header comment-signed-tag $commit commit $time >expect
868
echo '-----BEGIN PGP SIGNATURE-----' >>expect
869
test_expect_success \
870
'creating a signed tag with #commented -m message should succeed' '
871
- git-tag -s -m "#comment" comment-signed-tag &&
871
+ git tag -s -m "#comment" comment-signed-tag &&
872
get_tag_msg comment-signed-tag >actual &&
873
test_cmp expect actual &&
874
- git-tag -v comment-signed-tag
874
+ git tag -v comment-signed-tag
875
'
876
877
echo '#comment' >sigcommentfile
@@ -881,10 +881,10 @@ get_tag_header commentfile-signed-tag $commit commit $time >expect
881
echo '-----BEGIN PGP SIGNATURE-----' >>expect
882
test_expect_success \
883
'creating a signed tag with #commented -F messagefile should succeed' '
884
- git-tag -s -F sigcommentfile commentfile-signed-tag &&
884
+ git tag -s -F sigcommentfile commentfile-signed-tag &&
885
get_tag_msg commentfile-signed-tag >actual &&
886
test_cmp expect actual &&
887
- git-tag -v commentfile-signed-tag
887
+ git tag -v commentfile-signed-tag
888
'
889
890
printf '#comment' >sigcommentnonlfile
@@ -892,61 +892,61 @@ get_tag_header commentnonlfile-signed-tag $commit commit $time >expect
892
echo '-----BEGIN PGP SIGNATURE-----' >>expect
893
test_expect_success \
894
'creating a signed tag with a #comment and no newline should succeed' '
895
- git-tag -s -F sigcommentnonlfile commentnonlfile-signed-tag &&
895
+ git tag -s -F sigcommentnonlfile commentnonlfile-signed-tag &&
896
get_tag_msg commentnonlfile-signed-tag >actual &&
897
test_cmp expect actual &&
898
- git-tag -v commentnonlfile-signed-tag
898
+ git tag -v commentnonlfile-signed-tag
899
'
900
901
# listing messages for signed tags:
902
903
test_expect_success \
904
'listing the one-line message of a signed tag should succeed' '
905
- git-tag -s -m "A message line signed" stag-one-line &&
905
+ git tag -s -m "A message line signed" stag-one-line &&
906
907
echo "stag-one-line" >expect &&
908
- git-tag -l | grep "^stag-one-line" >actual &&
908
+ git tag -l | grep "^stag-one-line" >actual &&
909
test_cmp expect actual &&
910
- git-tag -n0 -l | grep "^stag-one-line" >actual &&
910
+ git tag -n0 -l | grep "^stag-one-line" >actual &&
911
test_cmp expect actual &&
912
- git-tag -n0 -l stag-one-line >actual &&
912
+ git tag -n0 -l stag-one-line >actual &&
913
test_cmp expect actual &&
914
915
echo "stag-one-line A message line signed" >expect &&
916
- git-tag -n1 -l | grep "^stag-one-line" >actual &&
916
+ git tag -n1 -l | grep "^stag-one-line" >actual &&
917
test_cmp expect actual &&
918
- git-tag -n -l | grep "^stag-one-line" >actual &&
918
+ git tag -n -l | grep "^stag-one-line" >actual &&
919
test_cmp expect actual &&
920
- git-tag -n1 -l stag-one-line >actual &&
920
+ git tag -n1 -l stag-one-line >actual &&
921
test_cmp expect actual &&
922
- git-tag -n2 -l stag-one-line >actual &&
922
+ git tag -n2 -l stag-one-line >actual &&
923
test_cmp expect actual &&
924
- git-tag -n999 -l stag-one-line >actual &&
924
+ git tag -n999 -l stag-one-line >actual &&
925
test_cmp expect actual
926
'
927
928
test_expect_success \
929
'listing the zero-lines message of a signed tag should succeed' '
930
- git-tag -s -m "" stag-zero-lines &&
930
+ git tag -s -m "" stag-zero-lines &&
931
932
echo "stag-zero-lines" >expect &&
933
- git-tag -l | grep "^stag-zero-lines" >actual &&
933
+ git tag -l | grep "^stag-zero-lines" >actual &&
934
test_cmp expect actual &&
935
- git-tag -n0 -l | grep "^stag-zero-lines" >actual &&
935
+ git tag -n0 -l | grep "^stag-zero-lines" >actual &&
936
test_cmp expect actual &&
937
- git-tag -n0 -l stag-zero-lines >actual &&
937
+ git tag -n0 -l stag-zero-lines >actual &&
938
test_cmp expect actual &&
939
940
echo "stag-zero-lines " >expect &&
941
- git-tag -n1 -l | grep "^stag-zero-lines" >actual &&
941
+ git tag -n1 -l | grep "^stag-zero-lines" >actual &&
942
test_cmp expect actual &&
943
- git-tag -n -l | grep "^stag-zero-lines" >actual &&
943
+ git tag -n -l | grep "^stag-zero-lines" >actual &&
944
test_cmp expect actual &&
945
- git-tag -n1 -l stag-zero-lines >actual &&
945
+ git tag -n1 -l stag-zero-lines >actual &&
946
test_cmp expect actual &&
947
- git-tag -n2 -l stag-zero-lines >actual &&
947
+ git tag -n2 -l stag-zero-lines >actual &&
948
test_cmp expect actual &&
949
- git-tag -n999 -l stag-zero-lines >actual &&
949
+ git tag -n999 -l stag-zero-lines >actual &&
950
test_cmp expect actual
951
'
952
@@ -955,42 +955,42 @@ echo 'stag line two' >>sigtagmsg
955
echo 'stag line three' >>sigtagmsg
956
test_expect_success \
957
'listing many message lines of a signed tag should succeed' '
958
- git-tag -s -F sigtagmsg stag-lines &&
958
+ git tag -s -F sigtagmsg stag-lines &&
959
960
echo "stag-lines" >expect &&
961
- git-tag -l | grep "^stag-lines" >actual &&
961
+ git tag -l | grep "^stag-lines" >actual &&
962
test_cmp expect actual &&
963
- git-tag -n0 -l | grep "^stag-lines" >actual &&
963
+ git tag -n0 -l | grep "^stag-lines" >actual &&
964
test_cmp expect actual &&
965
- git-tag -n0 -l stag-lines >actual &&
965
+ git tag -n0 -l stag-lines >actual &&
966
test_cmp expect actual &&
967
968
echo "stag-lines stag line one" >expect &&
969
- git-tag -n1 -l | grep "^stag-lines" >actual &&
969
+ git tag -n1 -l | grep "^stag-lines" >actual &&
970
test_cmp expect actual &&
971
- git-tag -n -l | grep "^stag-lines" >actual &&
971
+ git tag -n -l | grep "^stag-lines" >actual &&
972
test_cmp expect actual &&
973
- git-tag -n1 -l stag-lines >actual &&
973
+ git tag -n1 -l stag-lines >actual &&
974
test_cmp expect actual &&
975
976
echo " stag line two" >>expect &&
977
- git-tag -n2 -l | grep "^ *stag.line" >actual &&
977
+ git tag -n2 -l | grep "^ *stag.line" >actual &&
978
test_cmp expect actual &&
979
- git-tag -n2 -l stag-lines >actual &&
979
+ git tag -n2 -l stag-lines >actual &&
980
test_cmp expect actual &&
981
982
echo " stag line three" >>expect &&
983
- git-tag -n3 -l | grep "^ *stag.line" >actual &&
983
+ git tag -n3 -l | grep "^ *stag.line" >actual &&
984
test_cmp expect actual &&
985
- git-tag -n3 -l stag-lines >actual &&
985
+ git tag -n3 -l stag-lines >actual &&
986
test_cmp expect actual &&
987
- git-tag -n4 -l | grep "^ *stag.line" >actual &&
987
+ git tag -n4 -l | grep "^ *stag.line" >actual &&
988
test_cmp expect actual &&
989
- git-tag -n4 -l stag-lines >actual &&
989
+ git tag -n4 -l stag-lines >actual &&
990
test_cmp expect actual &&
991
- git-tag -n99 -l | grep "^ *stag.line" >actual &&
991
+ git tag -n99 -l | grep "^ *stag.line" >actual &&
992
test_cmp expect actual &&
993
- git-tag -n99 -l stag-lines >actual &&
993
+ git tag -n99 -l stag-lines >actual &&
994
test_cmp expect actual
995
'
996
@@ -1005,7 +1005,7 @@ echo "A message for a tree" >>expect
1005
echo '-----BEGIN PGP SIGNATURE-----' >>expect
1006
test_expect_success \
1007
'creating a signed tag pointing to a tree should succeed' '
1008
- git-tag -s -m "A message for a tree" tree-signed-tag HEAD^{tree} &&
1008
+ git tag -s -m "A message for a tree" tree-signed-tag HEAD^{tree} &&
1009
get_tag_msg tree-signed-tag >actual &&
1010
test_cmp expect actual
1011
'
@@ -1015,7 +1015,7 @@ echo "A message for a blob" >>expect
1015
echo '-----BEGIN PGP SIGNATURE-----' >>expect
1016
test_expect_success \
1017
'creating a signed tag pointing to a blob should succeed' '
1018
- git-tag -s -m "A message for a blob" blob-signed-tag HEAD:foo &&
1018
+ git tag -s -m "A message for a blob" blob-signed-tag HEAD:foo &&
1019
get_tag_msg blob-signed-tag >actual &&
1020
test_cmp expect actual
1021
'
@@ -1025,7 +1025,7 @@ echo "A message for another tag" >>expect
1025
echo '-----BEGIN PGP SIGNATURE-----' >>expect
1026
test_expect_success \
1027
'creating a signed tag pointing to another tag should succeed' '
1028
- git-tag -s -m "A message for another tag" tag-signed-tag signed-tag &&
1028
+ git tag -s -m "A message for another tag" tag-signed-tag signed-tag &&
1029
get_tag_msg tag-signed-tag >actual &&
1030
test_cmp expect actual
1031
'
@@ -1033,7 +1033,7 @@ test_expect_success \
1033
# try to sign with bad user.signingkey
1034
git config user.signingkey BobTheMouse
1035
test_expect_success \
1036
- 'git-tag -s fails if gpg is misconfigured' \
1036
+ 'git tag -s fails if gpg is misconfigured' \
1037
'test_must_fail git tag -s -m tail tag-gpg-failure'
1038
git config --unset user.signingkey
1039
@@ -1042,10 +1042,10 @@ git config --unset user.signingkey
1042
rm -rf gpghome
1043
test_expect_success \
1044
'verify signed tag fails when public key is not present' \
1045
- 'test_must_fail git-tag -v signed-tag'
1045
+ 'test_must_fail git tag -v signed-tag'
1046
1047
test_expect_success \
1048
- 'git-tag -a fails if tag annotation is empty' '
1048
+ 'git tag -a fails if tag annotation is empty' '
1049
! (GIT_EDITOR=cat git tag -a initial-comment)
1050
'
1051
t/t7101-reset.sh
+4
-4
@@ -3,7 +3,7 @@
3
# Copyright (c) 2006 Shawn Pearce
4
#
5
6
-test_description='git-reset should cull empty subdirs'
6
+test_description='git reset should cull empty subdirs'
7
. ./test-lib.sh
8
9
test_expect_success \
@@ -11,7 +11,7 @@ test_expect_success \
11
'mkdir path0 &&
12
cp ../../COPYING path0/COPYING &&
13
git add path0/COPYING &&
14
- git-commit -m add -a'
14
+ git commit -m add -a'
15
16
test_expect_success \
17
'creating second files' \
@@ -25,11 +25,11 @@ test_expect_success \
25
git add path1/COPYING &&
26
git add COPYING &&
27
git add path0/COPYING-TOO &&
28
- git-commit -m change -a'
28
+ git commit -m change -a'
29
30
test_expect_success \
31
'resetting tree HEAD^' \
32
- 'git-reset --hard HEAD^'
32
+ 'git reset --hard HEAD^'
33
34
test_expect_success \
35
'checking initial files exist after rewind' \
t/t7102-reset.sh
+2
-2
@@ -3,9 +3,9 @@
3
# Copyright (c) 2007 Carlos Rica
4
#
5
6
-test_description='git-reset
6
+test_description='git reset
7
8
-Documented tests for git-reset'
8
+Documented tests for git reset'
9
10
. ./test-lib.sh
11
t/t7103-reset-bare.sh
+1
-1
@@ -1,6 +1,6 @@
1
#!/bin/sh
2
3
-test_description='git-reset in a bare repository'
3
+test_description='git reset in a bare repository'
4
. ./test-lib.sh
5
6
test_expect_success 'setup non-bare' '