@matheusbsbs / matheus-bagliano / commits / 3604e7c5c6
Fork 0

tests: use "git xyzzy" form (t3600 - t6999)

Converts tests between t3600-t6300. 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 3604e7c5c6f8d48e221ea5b21ef26fc3e27eff9e
26 files changed +130 -130
t/t3600-rm.sh
+2 -2
@@ -12,14 +12,14 @@ test_expect_success \
12 'Initialize test directory' \
13 "touch -- foo bar baz 'space embedded' -q &&
14 git add -- foo bar baz 'space embedded' -q &&
15 - git-commit -m 'add normal files' &&
15 + git commit -m 'add normal files' &&
16 test_tabs=y &&
17 if touch -- 'tab embedded' 'newline
18 embedded'
19 then
20 git add -- 'tab embedded' 'newline
21 embedded' &&
22 - git-commit -m 'add files with tabs and newlines'
22 + git commit -m 'add files with tabs and newlines'
23 else
24 say 'Your filesystem does not allow tabs in filenames.'
25 test_tabs=n
t/t4012-diff-binary.sh
+2 -2
@@ -61,7 +61,7 @@ test_expect_success 'apply detecting corrupt patch correctly' \
61 detected=`sed -ne "${detected}p" broken` &&
62 test "$detected" = xCIT'
63
64 -test_expect_success 'initial commit' 'git-commit -a -m initial'
64 +test_expect_success 'initial commit' 'git commit -a -m initial'
65
66 # Try removal (b), modification (d), and creation (e).
67 test_expect_success 'diff-index with --binary' \
@@ -72,7 +72,7 @@ test_expect_success 'diff-index with --binary' \
72 git apply --stat --summary current'
73
74 test_expect_success 'apply binary patch' \
75 - 'git-reset --hard &&
75 + 'git reset --hard &&
76 git apply --binary --index <current &&
77 tree1=`git write-tree` &&
78 test "$tree1" = "$tree0"'
t/t4103-apply-binary.sh
+13 -13
@@ -21,16 +21,16 @@ cat file1 >file2
21 cat file1 >file4
22
23 git update-index --add --remove file1 file2 file4
24 -git-commit -m 'Initial Version' 2>/dev/null
24 +git commit -m 'Initial Version' 2>/dev/null
25
26 -git-checkout -b binary
26 +git checkout -b binary
27 perl -pe 'y/x/\000/' <file1 >file3
28 cat file3 >file4
29 git add file2
30 perl -pe 'y/\000/v/' <file3 >file1
31 rm -f file2
32 git update-index --add --remove file1 file2 file3 file4
33 -git-commit -m 'Second Version'
33 +git commit -m 'Second Version'
34
35 git diff-tree -p master binary >B.diff
36 git diff-tree -p -C master binary >C.diff
@@ -39,47 +39,47 @@ git diff-tree -p --binary master binary >BF.diff
39 git diff-tree -p --binary -C master binary >CF.diff
40
41 test_expect_success 'stat binary diff -- should not fail.' \
42 - 'git-checkout master
42 + 'git checkout master
43 git apply --stat --summary B.diff'
44
45 test_expect_success 'stat binary diff (copy) -- should not fail.' \
46 - 'git-checkout master
46 + 'git checkout master
47 git apply --stat --summary C.diff'
48
49 test_expect_success 'check binary diff -- should fail.' \
50 - 'git-checkout master &&
50 + 'git checkout master &&
51 test_must_fail git apply --check B.diff'
52
53 test_expect_success 'check binary diff (copy) -- should fail.' \
54 - 'git-checkout master &&
54 + 'git checkout master &&
55 test_must_fail git apply --check C.diff'
56
57 test_expect_success \
58 'check incomplete binary diff with replacement -- should fail.' '
59 - git-checkout master &&
59 + git checkout master &&
60 test_must_fail git apply --check --allow-binary-replacement B.diff
61 '
62
63 test_expect_success \
64 'check incomplete binary diff with replacement (copy) -- should fail.' '
65 - git-checkout master &&
65 + git checkout master &&
66 test_must_fail git apply --check --allow-binary-replacement C.diff
67 '
68
69 test_expect_success 'check binary diff with replacement.' \
70 - 'git-checkout master
70 + 'git checkout master
71 git apply --check --allow-binary-replacement BF.diff'
72
73 test_expect_success 'check binary diff with replacement (copy).' \
74 - 'git-checkout master
74 + 'git checkout master
75 git apply --check --allow-binary-replacement CF.diff'
76
77 # Now we start applying them.
78
79 do_reset () {
80 rm -f file? &&
81 - git-reset --hard &&
82 - git-checkout -f master
81 + git reset --hard &&
82 + git checkout -f master
83 }
84
85 test_expect_success 'apply binary diff -- should fail.' \
t/t4124-apply-ws-rule.sh
+1 -1
@@ -1,6 +1,6 @@
1 #!/bin/sh
2
3 -test_description='core.whitespace rules and git-apply'
3 +test_description='core.whitespace rules and git apply'
4
5 . ./test-lib.sh
6
t/t4127-apply-same-fn.sh
+2 -2
@@ -26,7 +26,7 @@ test_expect_success 'apply same filename with independent changes' '
26 git diff >> patch0 &&
27 cp same_fn same_fn2 &&
28 git reset --hard &&
29 - git-apply patch0 &&
29 + git apply patch0 &&
30 diff same_fn same_fn2
31 '
32
@@ -39,7 +39,7 @@ test_expect_success 'apply same filename with overlapping changes' '
39 git diff >> patch0 &&
40 cp same_fn same_fn2 &&
41 git reset --hard &&
42 - git-apply patch0 &&
42 + git apply patch0 &&
43 diff same_fn same_fn2
44 '
45
t/t4150-am.sh
+1 -1
@@ -164,7 +164,7 @@ test_expect_success 'am --keep really keeps the subject' '
164 git checkout HEAD^ &&
165 git am --keep patch4 &&
166 ! test -d .git/rebase-apply &&
167 - git-cat-file commit HEAD |
167 + git cat-file commit HEAD |
168 grep -q -F "Re: Re: Re: [PATCH 1/5 v2] third"
169 '
170
t/t4151-am-abort.sh
+2 -2
@@ -44,14 +44,14 @@ do
44 '
45
46 test_expect_success "am$with3 --skip continue after failed am$with3" '
47 - test_must_fail git-am$with3 --skip >output &&
47 + test_must_fail git am$with3 --skip >output &&
48 test "$(grep "^Applying" output)" = "Applying: 6" &&
49 test_cmp file-2-expect file-2 &&
50 test ! -f .git/rr-cache/MERGE_RR
51 '
52
53 test_expect_success "am --abort goes back after failed am$with3" '
54 - git-am --abort &&
54 + git am --abort &&
55 git rev-parse HEAD >actual &&
56 git rev-parse initial >expect &&
57 test_cmp expect actual &&
t/t5300-pack-object.sh
+8 -8
@@ -3,7 +3,7 @@
3 # Copyright (c) 2005 Junio C Hamano
4 #
5
6 -test_description='git-pack-object
6 +test_description='git pack-object
7
8 '
9 . ./test-lib.sh
@@ -236,24 +236,24 @@ test_expect_success \
236 test_expect_success \
237 'build pack index for an existing pack' \
238 'cat test-1-${packname_1}.pack >test-3.pack &&
239 - git-index-pack -o tmp.idx test-3.pack &&
239 + git index-pack -o tmp.idx test-3.pack &&
240 cmp tmp.idx test-1-${packname_1}.idx &&
241
242 - git-index-pack test-3.pack &&
242 + git index-pack test-3.pack &&
243 cmp test-3.idx test-1-${packname_1}.idx &&
244
245 cat test-2-${packname_2}.pack >test-3.pack &&
246 - git-index-pack -o tmp.idx test-2-${packname_2}.pack &&
246 + git index-pack -o tmp.idx test-2-${packname_2}.pack &&
247 cmp tmp.idx test-2-${packname_2}.idx &&
248
249 - git-index-pack test-3.pack &&
249 + git index-pack test-3.pack &&
250 cmp test-3.idx test-2-${packname_2}.idx &&
251
252 cat test-3-${packname_3}.pack >test-3.pack &&
253 - git-index-pack -o tmp.idx test-3-${packname_3}.pack &&
253 + git index-pack -o tmp.idx test-3-${packname_3}.pack &&
254 cmp tmp.idx test-3-${packname_3}.idx &&
255
256 - git-index-pack test-3.pack &&
256 + git index-pack test-3.pack &&
257 cmp test-3.idx test-3-${packname_3}.idx &&
258
259 :'
@@ -266,7 +266,7 @@ test_expect_success \
266
267 test_expect_success \
268 'make sure index-pack detects the SHA1 collision' \
269 - 'test_must_fail git-index-pack -o bad.idx test-3.pack'
269 + 'test_must_fail git index-pack -o bad.idx test-3.pack'
270
271 test_expect_success \
272 'honor pack.packSizeLimit' \
t/t5301-sliding-window.sh
+2 -2
@@ -19,7 +19,7 @@ test_expect_success \
19 tree=`git write-tree` &&
20 commit1=`git commit-tree $tree </dev/null` &&
21 git update-ref HEAD $commit1 &&
22 - git-repack -a -d &&
22 + git repack -a -d &&
23 test "`git count-objects`" = "0 objects, 0 kilobytes" &&
24 pack1=`ls .git/objects/pack/*.pack` &&
25 test -f "$pack1"'
@@ -45,7 +45,7 @@ test_expect_success \
45 git config core.packedGitLimit 512 &&
46 commit2=`git commit-tree $tree -p $commit1 </dev/null` &&
47 git update-ref HEAD $commit2 &&
48 - git-repack -a -d &&
48 + git repack -a -d &&
49 test "`git count-objects`" = "0 objects, 0 kilobytes" &&
50 pack2=`ls .git/objects/pack/*.pack` &&
51 test -f "$pack2"
t/t5302-pack-index.sh
+6 -6
@@ -48,11 +48,11 @@ test_expect_success \
48
49 test_expect_success \
50 'index-pack with index version 1' \
51 - 'git-index-pack --index-version=1 -o 1.idx "test-1-${pack1}.pack"'
51 + 'git index-pack --index-version=1 -o 1.idx "test-1-${pack1}.pack"'
52
53 test_expect_success \
54 'index-pack with index version 2' \
55 - 'git-index-pack --index-version=2 -o 2.idx "test-1-${pack1}.pack"'
55 + 'git index-pack --index-version=2 -o 2.idx "test-1-${pack1}.pack"'
56
57 test_expect_success \
58 'index-pack results should match pack-objects ones' \
@@ -85,7 +85,7 @@ test_expect_success \
85 test "$have_64bits" &&
86 test_expect_success \
87 'index v2: force some 64-bit offsets with index-pack' \
88 - 'git-index-pack --index-version=2,0x40000 -o 3.idx "test-1-${pack1}.pack"'
88 + 'git index-pack --index-version=2,0x40000 -o 3.idx "test-1-${pack1}.pack"'
89
90 test "$have_64bits" &&
91 test_expect_success \
@@ -94,7 +94,7 @@ test_expect_success \
94
95 test_expect_success \
96 '[index v1] 1) stream pack to repository' \
97 - 'git-index-pack --index-version=1 --stdin < "test-1-${pack1}.pack" &&
97 + 'git index-pack --index-version=1 --stdin < "test-1-${pack1}.pack" &&
98 git prune-packed &&
99 git count-objects | ( read nr rest && test "$nr" -eq 1 ) &&
100 cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" &&
@@ -132,7 +132,7 @@ test_expect_success \
132 test_expect_success \
133 '[index v2] 1) stream pack to repository' \
134 'rm -f .git/objects/pack/* &&
135 - git-index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
135 + git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
136 git prune-packed &&
137 git count-objects | ( read nr rest && test "$nr" -eq 1 ) &&
138 cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" &&
@@ -165,7 +165,7 @@ test_expect_success \
165 test_expect_success \
166 '[index v2] 6) verify-pack detects CRC mismatch' \
167 'rm -f .git/objects/pack/* &&
168 - git-index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
168 + git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
169 git verify-pack ".git/objects/pack/pack-${pack1}.pack" &&
170 chmod +w ".git/objects/pack/pack-${pack1}.idx" &&
171 dd if=/dev/zero of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \
t/t5305-include-tag.sh
+1 -1
@@ -1,6 +1,6 @@
1 #!/bin/sh
2
3 -test_description='git-pack-object --include-tag'
3 +test_description='git pack-object --include-tag'
4 . ./test-lib.sh
5
6 TRASH=`pwd`
t/t5400-send-pack.sh
+15 -15
@@ -31,7 +31,7 @@ test_expect_success setup '
31 parent=$commit || return 1
32 done &&
33 git update-ref HEAD "$commit" &&
34 - git-clone ./. victim &&
34 + git clone ./. victim &&
35 cd victim &&
36 git log &&
37 cd .. &&
@@ -68,7 +68,7 @@ test_expect_success 'pack the destination repository' '
68 test_expect_success \
69 'pushing rewound head should not barf but require --force' '
70 # should not fail but refuse to update.
71 - if git-send-pack ./victim/.git/ master
71 + if git send-pack ./victim/.git/ master
72 then
73 # now it should fail with Pasky patch
74 echo >&2 Gaah, it should have failed.
@@ -85,7 +85,7 @@ test_expect_success \
85 true
86 fi &&
87 # this should update
88 - git-send-pack --force ./victim/.git/ master &&
88 + git send-pack --force ./victim/.git/ master &&
89 cmp victim/.git/refs/heads/master .git/refs/heads/master
90 '
91
@@ -95,7 +95,7 @@ test_expect_success \
95 git branch extra master &&
96 cd .. &&
97 test -f victim/.git/refs/heads/extra &&
98 - git-send-pack ./victim/.git/ :extra master &&
98 + git send-pack ./victim/.git/ :extra master &&
99 ! test -f victim/.git/refs/heads/extra
100 '
101
@@ -109,27 +109,27 @@ test_expect_success \
109 git config receive.denyNonFastforwards true &&
110 cd .. &&
111 git update-ref refs/heads/master master^ || return 1
112 - git-send-pack --force ./victim/.git/ master && return 1
112 + git send-pack --force ./victim/.git/ master && return 1
113 ! test_cmp .git/refs/heads/master victim/.git/refs/heads/master
114 '
115
116 test_expect_success \
117 'pushing does not include non-head refs' '
118 mkdir parent && cd parent &&
119 - git-init && touch file && git-add file && git-commit -m add &&
119 + git init && touch file && git add file && git commit -m add &&
120 cd .. &&
121 - git-clone parent child && cd child && git-push --all &&
121 + git clone parent child && cd child && git push --all &&
122 cd ../parent &&
123 - git-branch -a >branches && ! grep origin/master branches
123 + git branch -a >branches && ! grep origin/master branches
124 '
125
126 rewound_push_setup() {
127 rm -rf parent child &&
128 mkdir parent && cd parent &&
129 - git-init && echo one >file && git-add file && git-commit -m one &&
130 - echo two >file && git-commit -a -m two &&
129 + git init && echo one >file && git add file && git commit -m one &&
130 + echo two >file && git commit -a -m two &&
131 cd .. &&
132 - git-clone parent child && cd child && git-reset --hard HEAD^
132 + git clone parent child && cd child && git reset --hard HEAD^
133 }
134
135 rewound_push_succeeded() {
@@ -148,26 +148,26 @@ rewound_push_failed() {
148 test_expect_success \
149 'pushing explicit refspecs respects forcing' '
150 rewound_push_setup &&
151 - if git-send-pack ../parent/.git refs/heads/master:refs/heads/master
151 + if git send-pack ../parent/.git refs/heads/master:refs/heads/master
152 then
153 false
154 else
155 true
156 fi && rewound_push_failed &&
157 - git-send-pack ../parent/.git +refs/heads/master:refs/heads/master &&
157 + git send-pack ../parent/.git +refs/heads/master:refs/heads/master &&
158 rewound_push_succeeded
159 '
160
161 test_expect_success \
162 'pushing wildcard refspecs respects forcing' '
163 rewound_push_setup &&
164 - if git-send-pack ../parent/.git refs/heads/*:refs/heads/*
164 + if git send-pack ../parent/.git refs/heads/*:refs/heads/*
165 then
166 false
167 else
168 true
169 fi && rewound_push_failed &&
170 - git-send-pack ../parent/.git +refs/heads/*:refs/heads/* &&
170 + git send-pack ../parent/.git +refs/heads/*:refs/heads/* &&
171 rewound_push_succeeded
172 '
173
t/t5401-update-hooks.sh
+2 -2
@@ -17,7 +17,7 @@ test_expect_success setup '
17 commit1=$(echo modify | git commit-tree $tree1 -p $commit0) &&
18 git update-ref refs/heads/master $commit0 &&
19 git update-ref refs/heads/tofail $commit1 &&
20 - git-clone ./. victim &&
20 + git clone ./. victim &&
21 GIT_DIR=victim/.git git update-ref refs/heads/tofail $commit1 &&
22 git update-ref refs/heads/master $commit1 &&
23 git update-ref refs/heads/tofail $commit0
@@ -61,7 +61,7 @@ EOF
61 chmod u+x victim/.git/hooks/post-update
62
63 test_expect_success push '
64 - test_must_fail git-send-pack --force ./victim/.git \
64 + test_must_fail git send-pack --force ./victim/.git \
65 master tofail >send.out 2>send.err
66 '
67
t/t5402-post-merge-hook.sh
+2 -2
@@ -16,9 +16,9 @@ test_expect_success setup '
16 tree1=$(git write-tree) &&
17 commit1=$(echo modify | git commit-tree $tree1 -p $commit0) &&
18 git update-ref refs/heads/master $commit0 &&
19 - git-clone ./. clone1 &&
19 + git clone ./. clone1 &&
20 GIT_DIR=clone1/.git git update-index --add a &&
21 - git-clone ./. clone2 &&
21 + git clone ./. clone2 &&
22 GIT_DIR=clone2/.git git update-index --add a
23 '
24
t/t5403-post-checkout-hook.sh
+2 -2
@@ -14,8 +14,8 @@ test_expect_success setup '
14 tree0=$(git write-tree) &&
15 commit0=$(echo setup | git commit-tree $tree0) &&
16 git update-ref refs/heads/master $commit0 &&
17 - git-clone ./. clone1 &&
18 - git-clone ./. clone2 &&
17 + git clone ./. clone1 &&
18 + git clone ./. clone2 &&
19 GIT_DIR=clone2/.git git branch -a new2 &&
20 echo Data for commit1. >clone2/b &&
21 GIT_DIR=clone2/.git git add clone2/b &&
t/t5500-fetch-pack.sh
+2 -2
@@ -58,7 +58,7 @@ pull_to_client () {
58
59 cd client
60 test_expect_success "$number pull" \
61 - "git-fetch-pack -k -v .. $heads"
61 + "git fetch-pack -k -v .. $heads"
62 case "$heads" in *A*) echo $ATIP > .git/refs/heads/A;; esac
63 case "$heads" in *B*) echo $BTIP > .git/refs/heads/B;; esac
64 git symbolic-ref HEAD refs/heads/`echo $heads | sed -e 's/^\(.\).*$/\1/'`
@@ -129,7 +129,7 @@ pull_to_client 2nd "B" $((64*3))
129
130 pull_to_client 3rd "A" $((1*3)) # old fails
131
132 -test_expect_success "clone shallow" 'git-clone --depth 2 "file://$(pwd)/." shallow'
132 +test_expect_success "clone shallow" 'git clone --depth 2 "file://$(pwd)/." shallow'
133
134 (cd shallow; git count-objects -v) > count.shallow
135
t/t5510-fetch.sh
+1 -1
@@ -111,7 +111,7 @@ test_expect_success 'fetch must not resolve short tag name' '
111 test_expect_success 'fetch must not resolve short remote name' '
112
113 cd "$D" &&
114 - git-update-ref refs/remotes/six/HEAD HEAD
114 + git update-ref refs/remotes/six/HEAD HEAD
115
116 mkdir six &&
117 cd six &&
t/t5530-upload-pack-error.sh
+2 -2
@@ -34,7 +34,7 @@ test_expect_success 'upload-pack fails due to error in pack-objects' '
34
35 ! echo "0032want $(git rev-parse HEAD)
36 00000009done
37 -0000" | git-upload-pack . > /dev/null 2> output.err &&
37 +0000" | git upload-pack . > /dev/null 2> output.err &&
38 grep "pack-objects died" output.err
39 '
40
@@ -52,7 +52,7 @@ test_expect_success 'upload-pack fails due to error in rev-list' '
52
53 ! echo "0032want $(git rev-parse HEAD)
54 00000009done
55 -0000" | git-upload-pack . > /dev/null 2> output.err &&
55 +0000" | git upload-pack . > /dev/null 2> output.err &&
56 grep "waitpid (async) failed" output.err
57 '
58
t/t5600-clone-fail-cleanup.sh
+6 -6
@@ -3,9 +3,9 @@
3 # Copyright (C) 2006 Carl D. Worth <cworth@cworth.org>
4 #
5
6 -test_description='test git-clone to cleanup after failure
6 +test_description='test git clone to cleanup after failure
7
8 -This test covers the fact that if git-clone fails, it should remove
8 +This test covers the fact that if git clone fails, it should remove
9 the directory it created, to avoid the user having to manually
10 remove the directory before attempting a clone again.'
11
@@ -13,7 +13,7 @@ remove the directory before attempting a clone again.'
13
14 test_expect_success \
15 'clone of non-existent source should fail' \
16 - 'test_must_fail git-clone foo bar'
16 + 'test_must_fail git clone foo bar'
17
18 test_expect_success \
19 'failed clone should not leave a directory' \
@@ -25,15 +25,15 @@ test_create_repo foo
25 # clone doesn't like it if there is no HEAD. Is that a bug?
26 (cd foo && touch file && git add file && git commit -m 'add file' >/dev/null 2>&1)
27
28 -# source repository given to git-clone should be relative to the
28 +# source repository given to git clone should be relative to the
29 # current path not to the target dir
30 test_expect_success \
31 'clone of non-existent (relative to $PWD) source should fail' \
32 - 'test_must_fail git-clone ../foo baz'
32 + 'test_must_fail git clone ../foo baz'
33
34 test_expect_success \
35 'clone should work now that source exists' \
36 - 'git-clone foo bar'
36 + 'git clone foo bar'
37
38 test_expect_success \
39 'successful clone must leave the directory' \
t/t5602-clone-remote-exec.sh
+2 -2
@@ -11,13 +11,13 @@ test_expect_success setup '
11 chmod +x not_ssh
12 '
13
14 -test_expect_success 'clone calls git-upload-pack unqualified with no -u option' '
14 +test_expect_success 'clone calls git upload-pack unqualified with no -u option' '
15 GIT_SSH=./not_ssh git clone localhost:/path/to/repo junk
16 echo "localhost git-upload-pack '\''/path/to/repo'\''" >expected
17 test_cmp expected not_ssh_output
18 '
19
20 -test_expect_success 'clone calls specified git-upload-pack with -u option' '
20 +test_expect_success 'clone calls specified git upload-pack with -u option' '
21 GIT_SSH=./not_ssh git clone -u /something/bin/git-upload-pack localhost:/path/to/repo junk
22 echo "localhost /something/bin/git-upload-pack '\''/path/to/repo'\''" >expected
23 test_cmp expected not_ssh_output
t/t6006-rev-list-format.sh
+3 -3
@@ -6,8 +6,8 @@ test_description='git rev-list --pretty=format test'
6
7 test_tick
8 test_expect_success 'setup' '
9 -touch foo && git add foo && git-commit -m "added foo" &&
10 - echo changed >foo && git-commit -a -m "changed foo"
9 +touch foo && git add foo && git commit -m "added foo" &&
10 + echo changed >foo && git commit -a -m "changed foo"
11 '
12
13 # usage: test_format name format_string <expected_output
@@ -110,7 +110,7 @@ include an iso8859 character: ¡bueno!
110 EOF
111 test_expect_success 'setup complex body' '
112 git config i18n.commitencoding iso8859-1 &&
113 - echo change2 >foo && git-commit -a -F commit-msg
113 + echo change2 >foo && git commit -a -F commit-msg
114 '
115
116 test_format complex-encoding %e <<'EOF'
t/t6025-merge-symlinks.sh
+16 -16
@@ -5,7 +5,7 @@
5
6 test_description='merging symlinks on filesystem w/o symlink support.
7
8 -This tests that git-merge-recursive writes merge results as plain files
8 +This tests that git merge-recursive writes merge results as plain files
9 if core.symlinks is false.'
10
11 . ./test-lib.sh
@@ -15,25 +15,25 @@ test_expect_success \
15 git config core.symlinks false &&
16 > file &&
17 git add file &&
18 -git-commit -m initial &&
18 +git commit -m initial &&
19 git branch b-symlink &&
20 git branch b-file &&
21 -l=$(echo -n file | git-hash-object -t blob -w --stdin) &&
21 +l=$(echo -n file | git hash-object -t blob -w --stdin) &&
22 echo "120000 $l symlink" | git update-index --index-info &&
23 -git-commit -m master &&
24 -git-checkout b-symlink &&
25 -l=$(echo -n file-different | git-hash-object -t blob -w --stdin) &&
23 +git commit -m master &&
24 +git checkout b-symlink &&
25 +l=$(echo -n file-different | git hash-object -t blob -w --stdin) &&
26 echo "120000 $l symlink" | git update-index --index-info &&
27 -git-commit -m b-symlink &&
28 -git-checkout b-file &&
27 +git commit -m b-symlink &&
28 +git checkout b-file &&
29 echo plain-file > symlink &&
30 git add symlink &&
31 -git-commit -m b-file'
31 +git commit -m b-file'
32
33 test_expect_success \
34 'merge master into b-symlink, which has a different symbolic link' '
35 -git-checkout b-symlink &&
36 -test_must_fail git-merge master'
35 +git checkout b-symlink &&
36 +test_must_fail git merge master'
37
38 test_expect_success \
39 'the merge result must be a file' '
@@ -41,8 +41,8 @@ test -f symlink'
41
42 test_expect_success \
43 'merge master into b-file, which has a file instead of a symbolic link' '
44 -git-reset --hard && git-checkout b-file &&
45 -test_must_fail git-merge master'
44 +git reset --hard && git checkout b-file &&
45 +test_must_fail git merge master'
46
47 test_expect_success \
48 'the merge result must be a file' '
@@ -50,9 +50,9 @@ test -f symlink'
50
51 test_expect_success \
52 'merge b-file, which has a file instead of a symbolic link, into master' '
53 -git-reset --hard &&
54 -git-checkout master &&
55 -test_must_fail git-merge b-file'
53 +git reset --hard &&
54 +git checkout master &&
55 +test_must_fail git merge b-file'
56
57 test_expect_success \
58 'the merge result must be a file' '
t/t6026-merge-attr.sh
+6 -6
@@ -106,9 +106,9 @@ test_expect_success 'custom merge backend' '
106
107 cmp binary union &&
108 sed -e 1,3d text >check-1 &&
109 - o=$(git-unpack-file master^:text) &&
110 - a=$(git-unpack-file side^:text) &&
111 - b=$(git-unpack-file master:text) &&
109 + o=$(git unpack-file master^:text) &&
110 + a=$(git unpack-file side^:text) &&
111 + b=$(git unpack-file master:text) &&
112 sh -c "./custom-merge $o $a $b 0" &&
113 sed -e 1,3d $a >check-2 &&
114 cmp check-1 check-2 &&
@@ -133,9 +133,9 @@ test_expect_success 'custom merge backend' '
133
134 cmp binary union &&
135 sed -e 1,3d text >check-1 &&
136 - o=$(git-unpack-file master^:text) &&
137 - a=$(git-unpack-file anchor:text) &&
138 - b=$(git-unpack-file master:text) &&
136 + o=$(git unpack-file master^:text) &&
137 + a=$(git unpack-file anchor:text) &&
138 + b=$(git unpack-file master:text) &&
139 sh -c "./custom-merge $o $a $b 0" &&
140 sed -e 1,3d $a >check-2 &&
141 cmp check-1 check-2 &&
t/t6030-bisect-porcelain.sh
+2 -2
@@ -2,7 +2,7 @@
2 #
3 # Copyright (c) 2007 Christian Couder
4 #
5 -test_description='Tests git-bisect functionality'
5 +test_description='Tests git bisect functionality'
6
7 exec </dev/null
8
@@ -23,7 +23,7 @@ add_line_into_file()
23 fi
24
25 test_tick
26 - git-commit --quiet -m "$MSG" $_file
26 + git commit --quiet -m "$MSG" $_file
27 }
28
29 HASH1=
t/t6120-describe.sh
+15 -15
@@ -31,57 +31,57 @@ check_describe () {
31 test_expect_success setup '
32
33 test_tick &&
34 - echo one >file && git add file && git-commit -m initial &&
34 + echo one >file && git add file && git commit -m initial &&
35 one=$(git rev-parse HEAD) &&
36
37 test_tick &&
38 - echo two >file && git add file && git-commit -m second &&
38 + echo two >file && git add file && git commit -m second &&
39 two=$(git rev-parse HEAD) &&
40
41 test_tick &&
42 - echo three >file && git add file && git-commit -m third &&
42 + echo three >file && git add file && git commit -m third &&
43
44 test_tick &&
45 - echo A >file && git add file && git-commit -m A &&
45 + echo A >file && git add file && git commit -m A &&
46 test_tick &&
47 - git-tag -a -m A A &&
47 + git tag -a -m A A &&
48
49 test_tick &&
50 - echo c >file && git add file && git-commit -m c &&
50 + echo c >file && git add file && git commit -m c &&
51 test_tick &&
52 - git-tag c &&
52 + git tag c &&
53
54 git reset --hard $two &&
55 test_tick &&
56 - echo B >side && git add side && git-commit -m B &&
56 + echo B >side && git add side && git commit -m B &&
57 test_tick &&
58 - git-tag -a -m B B &&
58 + git tag -a -m B B &&
59
60 test_tick &&
61 - git-merge -m Merged c &&
61 + git merge -m Merged c &&
62 merged=$(git rev-parse HEAD) &&
63
64 git reset --hard $two &&
65 test_tick &&
66 - echo D >another && git add another && git-commit -m D &&
66 + echo D >another && git add another && git commit -m D &&
67 test_tick &&
68 - git-tag -a -m D D &&
68 + git tag -a -m D D &&
69
70 test_tick &&
71 echo DD >another && git commit -a -m another &&
72
73 test_tick &&
74 - git-tag e &&
74 + git tag e &&
75
76 test_tick &&
77 echo DDD >another && git commit -a -m "yet another" &&
78
79 test_tick &&
80 - git-merge -m Merged $merged &&
80 + git merge -m Merged $merged &&
81
82 test_tick &&
83 echo X >file && echo X >side && git add file side &&
84 - git-commit -m x
84 + git commit -m x
85
86 '
87
t/t6300-for-each-ref.sh
+14 -14
@@ -97,27 +97,27 @@ test_atom tag contents 'Tagging at 1151939927
97 '
98
99 test_expect_success 'Check invalid atoms names are errors' '
100 - test_must_fail git-for-each-ref --format="%(INVALID)" refs/heads
100 + test_must_fail git for-each-ref --format="%(INVALID)" refs/heads
101 '
102
103 test_expect_success 'Check format specifiers are ignored in naming date atoms' '
104 - git-for-each-ref --format="%(authordate)" refs/heads &&
105 - git-for-each-ref --format="%(authordate:default) %(authordate)" refs/heads &&
106 - git-for-each-ref --format="%(authordate) %(authordate:default)" refs/heads &&
107 - git-for-each-ref --format="%(authordate:default) %(authordate:default)" refs/heads
104 + git for-each-ref --format="%(authordate)" refs/heads &&
105 + git for-each-ref --format="%(authordate:default) %(authordate)" refs/heads &&
106 + git for-each-ref --format="%(authordate) %(authordate:default)" refs/heads &&
107 + git for-each-ref --format="%(authordate:default) %(authordate:default)" refs/heads
108 '
109
110 test_expect_success 'Check valid format specifiers for date fields' '
111 - git-for-each-ref --format="%(authordate:default)" refs/heads &&
112 - git-for-each-ref --format="%(authordate:relative)" refs/heads &&
113 - git-for-each-ref --format="%(authordate:short)" refs/heads &&
114 - git-for-each-ref --format="%(authordate:local)" refs/heads &&
115 - git-for-each-ref --format="%(authordate:iso8601)" refs/heads &&
116 - git-for-each-ref --format="%(authordate:rfc2822)" refs/heads
111 + git for-each-ref --format="%(authordate:default)" refs/heads &&
112 + git for-each-ref --format="%(authordate:relative)" refs/heads &&
113 + git for-each-ref --format="%(authordate:short)" refs/heads &&
114 + git for-each-ref --format="%(authordate:local)" refs/heads &&
115 + git for-each-ref --format="%(authordate:iso8601)" refs/heads &&
116 + git for-each-ref --format="%(authordate:rfc2822)" refs/heads
117 '
118
119 test_expect_success 'Check invalid format specifiers are errors' '
120 - test_must_fail git-for-each-ref --format="%(authordate:INVALID)" refs/heads
120 + test_must_fail git for-each-ref --format="%(authordate:INVALID)" refs/heads
121 '
122
123 cat >expected <<\EOF
@@ -207,7 +207,7 @@ refs/tags/testtag
207 EOF
208
209 test_expect_success 'Verify ascending sort' '
210 - git-for-each-ref --format="%(refname)" --sort=refname >actual &&
210 + git for-each-ref --format="%(refname)" --sort=refname >actual &&
211 test_cmp expected actual
212 '
213
@@ -218,7 +218,7 @@ refs/heads/master
218 EOF
219
220 test_expect_success 'Verify descending sort' '
221 - git-for-each-ref --format="%(refname)" --sort=-refname >actual &&
221 + git for-each-ref --format="%(refname)" --sort=-refname >actual &&
222 test_cmp expected actual
223 '
224