@matheusbsbs / matheus-bagliano / commits / 0cb0e143ff
Fork 0

tests: use "git xyzzy" form (t0000 - t3599)

Converts tests between t0050-t3903. 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 0cb0e143ffa7d66b7feea0a967b3ac9ae6cd62b0
26 files changed +103 -103
t/t0050-filesystem.sh
+1 -1
@@ -85,7 +85,7 @@ $test_case 'add (with different case)' '
85 rm camelcase &&
86 echo 1 >CamelCase &&
87 git add CamelCase &&
88 - test $(git-ls-files | grep -i camelcase | wc -l) = 1
88 + test $(git ls-files | grep -i camelcase | wc -l) = 1
89
90 '
91
t/t1007-hash-object.sh
+1 -1
@@ -1,6 +1,6 @@
1 #!/bin/sh
2
3 -test_description="git-hash-object"
3 +test_description="git hash-object"
4
5 . ./test-lib.sh
6
t/t1200-tutorial.sh
+1 -1
@@ -78,7 +78,7 @@ test_expect_success 'git whatchanged -p --root' 'cmp whatchanged.expect whatchan
78 git tag my-first-tag
79 test_expect_success 'git tag my-first-tag' 'cmp .git/refs/heads/master .git/refs/tags/my-first-tag'
80
81 -# TODO: test git-clone
81 +# TODO: test git clone
82
83 git checkout -b mybranch
84 test_expect_success 'git checkout -b mybranch' 'cmp .git/refs/heads/master .git/refs/heads/mybranch'
t/t1303-wacky-config.sh
+1 -1
@@ -35,7 +35,7 @@ test_expect_success 'add key in different section' '
35 '
36
37 SECTION="test.q\"s\\sq'sp e.key"
38 -test_expect_success 'make sure git-config escapes section names properly' '
38 +test_expect_success 'make sure git config escapes section names properly' '
39 git config "$SECTION" bar &&
40 check "$SECTION" bar
41 '
t/t1400-update-ref.sh
+5 -5
@@ -228,21 +228,21 @@ test_expect_success \
228 'echo TEST >F &&
229 git add F &&
230 GIT_AUTHOR_DATE="2005-05-26 23:30" \
231 - GIT_COMMITTER_DATE="2005-05-26 23:30" git-commit -m add -a &&
231 + GIT_COMMITTER_DATE="2005-05-26 23:30" git commit -m add -a &&
232 h_TEST=$(git rev-parse --verify HEAD)
233 echo The other day this did not work. >M &&
234 echo And then Bob told me how to fix it. >>M &&
235 echo OTHER >F &&
236 GIT_AUTHOR_DATE="2005-05-26 23:41" \
237 - GIT_COMMITTER_DATE="2005-05-26 23:41" git-commit -F M -a &&
237 + GIT_COMMITTER_DATE="2005-05-26 23:41" git commit -F M -a &&
238 h_OTHER=$(git rev-parse --verify HEAD) &&
239 GIT_AUTHOR_DATE="2005-05-26 23:44" \
240 - GIT_COMMITTER_DATE="2005-05-26 23:44" git-commit --amend &&
240 + GIT_COMMITTER_DATE="2005-05-26 23:44" git commit --amend &&
241 h_FIXED=$(git rev-parse --verify HEAD) &&
242 echo Merged initial commit and a later commit. >M &&
243 echo $h_TEST >.git/MERGE_HEAD &&
244 GIT_AUTHOR_DATE="2005-05-26 23:45" \
245 - GIT_COMMITTER_DATE="2005-05-26 23:45" git-commit -F M &&
245 + GIT_COMMITTER_DATE="2005-05-26 23:45" git commit -F M &&
246 h_MERGED=$(git rev-parse --verify HEAD) &&
247 rm -f M'
248
@@ -253,7 +253,7 @@ $h_OTHER $h_FIXED $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117151040 +0000 co
253 $h_FIXED $h_MERGED $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117151100 +0000 commit (merge): Merged initial commit and a later commit.
254 EOF
255 test_expect_success \
256 - 'git-commit logged updates' \
256 + 'git commit logged updates' \
257 "diff expect .git/logs/$m"
258 unset h_TEST h_OTHER h_FIXED h_MERGED
259
t/t1503-rev-parse-verify.sh
+1 -1
@@ -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/t2005-checkout-index-symlinks.sh
+2 -2
@@ -13,7 +13,7 @@ file if core.symlinks is false.'
13 test_expect_success \
14 'preparation' '
15 git config core.symlinks false &&
16 -l=$(echo -n file | git-hash-object -t blob -w --stdin) &&
16 +l=$(echo -n file | git hash-object -t blob -w --stdin) &&
17 echo "120000 $l symlink" | git update-index --index-info'
18
19 test_expect_success \
@@ -23,6 +23,6 @@ test -f symlink'
23
24 test_expect_success \
25 'the file must be the blob we added during the setup' '
26 -test "$(git-hash-object -t blob symlink)" = $l'
26 +test "$(git hash-object -t blob symlink)" = $l'
27
28 test_done
t/t2050-git-dir-relative.sh
+2 -2
@@ -26,8 +26,8 @@ chmod +x .git/hooks/post-commit'
26
27 test_expect_success 'post-commit hook used ordinarily' '
28 echo initial >top &&
29 -git-add top
30 -git-commit -m initial &&
29 +git add top
30 +git commit -m initial &&
31 test -r "${COMMIT_FILE}"
32 '
33
t/t2101-update-index-reupdate.sh
+1 -1
@@ -40,7 +40,7 @@ test_expect_success 'update-index --remove --again' \
40 git ls-files -s >current &&
41 cmp current expected'
42
43 -test_expect_success 'first commit' 'git-commit -m initial'
43 +test_expect_success 'first commit' 'git commit -m initial'
44
45 cat > expected <<\EOF
46 100644 53ab446c3f4e42ce9bb728a0ccb283a101be4979 0 dir1/file3
t/t2102-update-index-symlinks.sh
+1 -1
@@ -13,7 +13,7 @@ even if a plain file is in the working tree if core.symlinks is false.'
13 test_expect_success \
14 'preparation' '
15 git config core.symlinks false &&
16 -l=$(echo -n file | git-hash-object -t blob -w --stdin) &&
16 +l=$(echo -n file | git hash-object -t blob -w --stdin) &&
17 echo "120000 $l symlink" | git update-index --index-info'
18
19 test_expect_success \
t/t2200-add-update.sh
+6 -6
@@ -26,7 +26,7 @@ test_expect_success setup '
26 echo initial >dir2/sub3 &&
27 git add check dir1 dir2 top foo &&
28 test_tick
29 - git-commit -m initial &&
29 + git commit -m initial &&
30
31 echo changed >check &&
32 echo changed >top &&
@@ -40,20 +40,20 @@ test_expect_success update '
40 '
41
42 test_expect_success 'update noticed a removal' '
43 - test "$(git-ls-files dir1/sub1)" = ""
43 + test "$(git ls-files dir1/sub1)" = ""
44 '
45
46 test_expect_success 'update touched correct path' '
47 - test "$(git-diff-files --name-status dir2/sub3)" = ""
47 + test "$(git diff-files --name-status dir2/sub3)" = ""
48 '
49
50 test_expect_success 'update did not touch other tracked files' '
51 - test "$(git-diff-files --name-status check)" = "M check" &&
52 - test "$(git-diff-files --name-status top)" = "M top"
51 + test "$(git diff-files --name-status check)" = "M check" &&
52 + test "$(git diff-files --name-status top)" = "M top"
53 '
54
55 test_expect_success 'update did not touch untracked files' '
56 - test "$(git-ls-files dir2/other)" = ""
56 + test "$(git ls-files dir2/other)" = ""
57 '
58
59 test_expect_success 'cache tree has not been corrupted' '
t/t3001-ls-files-others-exclude.sh
+1 -1
@@ -96,7 +96,7 @@ cat > expect << EOF
96 # three/
97 EOF
98
99 -test_expect_success 'git-status honours core.excludesfile' \
99 +test_expect_success 'git status honors core.excludesfile' \
100 'test_cmp expect output'
101
102 test_expect_success 'trailing slash in exclude allows directory match(1)' '
t/t3020-ls-files-error-unmatch.sh
+1 -1
@@ -13,7 +13,7 @@ line.
13
14 touch foo bar
15 git update-index --add foo bar
16 -git-commit -m "add foo bar"
16 +git commit -m "add foo bar"
17
18 test_expect_success \
19 'git ls-files --error-unmatch should fail with unmatched path.' \
t/t3030-merge-recursive.sh
+7 -7
@@ -241,7 +241,7 @@ test_expect_success 'merge-recursive simple' '
241 rm -fr [abcd] &&
242 git checkout -f "$c2" &&
243
244 - git-merge-recursive "$c0" -- "$c2" "$c1"
244 + git merge-recursive "$c0" -- "$c2" "$c1"
245 status=$?
246 case "$status" in
247 1)
@@ -285,7 +285,7 @@ test_expect_success 'merge-recursive remove conflict' '
285 rm -fr [abcd] &&
286 git checkout -f "$c1" &&
287
288 - git-merge-recursive "$c0" -- "$c1" "$c5"
288 + git merge-recursive "$c0" -- "$c1" "$c5"
289 status=$?
290 case "$status" in
291 1)
@@ -317,7 +317,7 @@ test_expect_success 'merge-recursive d/f simple' '
317 git reset --hard &&
318 git checkout -f "$c1" &&
319
320 - git-merge-recursive "$c0" -- "$c1" "$c3"
320 + git merge-recursive "$c0" -- "$c1" "$c3"
321 '
322
323 test_expect_success 'merge-recursive result' '
@@ -339,7 +339,7 @@ test_expect_success 'merge-recursive d/f conflict' '
339 git reset --hard &&
340 git checkout -f "$c1" &&
341
342 - git-merge-recursive "$c0" -- "$c1" "$c4"
342 + git merge-recursive "$c0" -- "$c1" "$c4"
343 status=$?
344 case "$status" in
345 1)
@@ -373,7 +373,7 @@ test_expect_success 'merge-recursive d/f conflict the other way' '
373 git reset --hard &&
374 git checkout -f "$c4" &&
375
376 - git-merge-recursive "$c0" -- "$c4" "$c1"
376 + git merge-recursive "$c0" -- "$c4" "$c1"
377 status=$?
378 case "$status" in
379 1)
@@ -407,7 +407,7 @@ test_expect_success 'merge-recursive d/f conflict' '
407 git reset --hard &&
408 git checkout -f "$c1" &&
409
410 - git-merge-recursive "$c0" -- "$c1" "$c6"
410 + git merge-recursive "$c0" -- "$c1" "$c6"
411 status=$?
412 case "$status" in
413 1)
@@ -441,7 +441,7 @@ test_expect_success 'merge-recursive d/f conflict' '
441 git reset --hard &&
442 git checkout -f "$c6" &&
443
444 - git-merge-recursive "$c0" -- "$c6" "$c1"
444 + git merge-recursive "$c0" -- "$c6" "$c1"
445 status=$?
446 case "$status" in
447 1)
t/t3200-branch.sh
+29 -29
@@ -14,10 +14,10 @@ test_expect_success \
14 'prepare a trivial repository' \
15 'echo Hello > A &&
16 git update-index --add A &&
17 - git-commit -m "Initial commit." &&
17 + git commit -m "Initial commit." &&
18 echo World >> A &&
19 git update-index --add A &&
20 - git-commit -m "Second commit." &&
20 + git commit -m "Second commit." &&
21 HEAD=$(git rev-parse --verify HEAD)'
22
23 test_expect_success \
@@ -123,7 +123,7 @@ test_expect_success \
123 test_expect_success 'test tracking setup via --track' \
124 'git config remote.local.url . &&
125 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
126 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
126 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
127 git branch --track my1 local/master &&
128 test $(git config branch.my1.remote) = local &&
129 test $(git config branch.my1.merge) = refs/heads/master'
@@ -131,7 +131,7 @@ test_expect_success 'test tracking setup via --track' \
131 test_expect_success 'test tracking setup (non-wildcard, matching)' \
132 'git config remote.local.url . &&
133 git config remote.local.fetch refs/heads/master:refs/remotes/local/master &&
134 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
134 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
135 git branch --track my4 local/master &&
136 test $(git config branch.my4.remote) = local &&
137 test $(git config branch.my4.merge) = refs/heads/master'
@@ -139,7 +139,7 @@ test_expect_success 'test tracking setup (non-wildcard, matching)' \
139 test_expect_success 'test tracking setup (non-wildcard, not matching)' \
140 'git config remote.local.url . &&
141 git config remote.local.fetch refs/heads/s:refs/remotes/local/s &&
142 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
142 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
143 git branch --track my5 local/master &&
144 ! test "$(git config branch.my5.remote)" = local &&
145 ! test "$(git config branch.my5.merge)" = refs/heads/master'
@@ -148,7 +148,7 @@ test_expect_success 'test tracking setup via config' \
148 'git config branch.autosetupmerge true &&
149 git config remote.local.url . &&
150 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
151 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
151 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
152 git branch my3 local/master &&
153 test $(git config branch.my3.remote) = local &&
154 test $(git config branch.my3.merge) = refs/heads/master'
@@ -157,7 +157,7 @@ test_expect_success 'test overriding tracking setup via --no-track' \
157 'git config branch.autosetupmerge true &&
158 git config remote.local.url . &&
159 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
160 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
160 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
161 git branch --no-track my2 local/master &&
162 git config branch.autosetupmerge false &&
163 ! test "$(git config branch.my2.remote)" = local &&
@@ -173,7 +173,7 @@ test_expect_success 'no tracking without .fetch entries' \
173 test_expect_success 'test tracking setup via --track but deeper' \
174 'git config remote.local.url . &&
175 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
176 - (git show-ref -q refs/remotes/local/o/o || git-fetch local) &&
176 + (git show-ref -q refs/remotes/local/o/o || git fetch local) &&
177 git branch --track my7 local/o/o &&
178 test "$(git config branch.my7.remote)" = local &&
179 test "$(git config branch.my7.merge)" = refs/heads/o/o'
@@ -209,7 +209,7 @@ EOF
209 test_expect_success \
210 'git checkout -b g/h/i -l should create a branch and a log' \
211 'GIT_COMMITTER_DATE="2005-05-26 23:30" \
212 - git-checkout -b g/h/i -l master &&
212 + git checkout -b g/h/i -l master &&
213 test -f .git/refs/heads/g/h/i &&
214 test -f .git/logs/refs/heads/g/h/i &&
215 diff expect .git/logs/refs/heads/g/h/i'
@@ -228,7 +228,7 @@ test_expect_success 'autosetuprebase local on a tracked local branch' '
228 git config remote.local.url . &&
229 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
230 git config branch.autosetuprebase local &&
231 - (git show-ref -q refs/remotes/local/o || git-fetch local) &&
231 + (git show-ref -q refs/remotes/local/o || git fetch local) &&
232 git branch mybase &&
233 git branch --track myr1 mybase &&
234 test "$(git config branch.myr1.remote)" = . &&
@@ -240,7 +240,7 @@ test_expect_success 'autosetuprebase always on a tracked local branch' '
240 git config remote.local.url . &&
241 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
242 git config branch.autosetuprebase always &&
243 - (git show-ref -q refs/remotes/local/o || git-fetch local) &&
243 + (git show-ref -q refs/remotes/local/o || git fetch local) &&
244 git branch mybase2 &&
245 git branch --track myr2 mybase &&
246 test "$(git config branch.myr2.remote)" = . &&
@@ -252,7 +252,7 @@ test_expect_success 'autosetuprebase remote on a tracked local branch' '
252 git config remote.local.url . &&
253 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
254 git config branch.autosetuprebase remote &&
255 - (git show-ref -q refs/remotes/local/o || git-fetch local) &&
255 + (git show-ref -q refs/remotes/local/o || git fetch local) &&
256 git branch mybase3 &&
257 git branch --track myr3 mybase2 &&
258 test "$(git config branch.myr3.remote)" = . &&
@@ -264,7 +264,7 @@ test_expect_success 'autosetuprebase never on a tracked local branch' '
264 git config remote.local.url . &&
265 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
266 git config branch.autosetuprebase never &&
267 - (git show-ref -q refs/remotes/local/o || git-fetch local) &&
267 + (git show-ref -q refs/remotes/local/o || git fetch local) &&
268 git branch mybase4 &&
269 git branch --track myr4 mybase2 &&
270 test "$(git config branch.myr4.remote)" = . &&
@@ -276,7 +276,7 @@ test_expect_success 'autosetuprebase local on a tracked remote branch' '
276 git config remote.local.url . &&
277 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
278 git config branch.autosetuprebase local &&
279 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
279 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
280 git branch --track myr5 local/master &&
281 test "$(git config branch.myr5.remote)" = local &&
282 test "$(git config branch.myr5.merge)" = refs/heads/master &&
@@ -287,7 +287,7 @@ test_expect_success 'autosetuprebase never on a tracked remote branch' '
287 git config remote.local.url . &&
288 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
289 git config branch.autosetuprebase never &&
290 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
290 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
291 git branch --track myr6 local/master &&
292 test "$(git config branch.myr6.remote)" = local &&
293 test "$(git config branch.myr6.merge)" = refs/heads/master &&
@@ -298,7 +298,7 @@ test_expect_success 'autosetuprebase remote on a tracked remote branch' '
298 git config remote.local.url . &&
299 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
300 git config branch.autosetuprebase remote &&
301 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
301 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
302 git branch --track myr7 local/master &&
303 test "$(git config branch.myr7.remote)" = local &&
304 test "$(git config branch.myr7.merge)" = refs/heads/master &&
@@ -309,7 +309,7 @@ test_expect_success 'autosetuprebase always on a tracked remote branch' '
309 git config remote.local.url . &&
310 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
311 git config branch.autosetuprebase remote &&
312 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
312 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
313 git branch --track myr8 local/master &&
314 test "$(git config branch.myr8.remote)" = local &&
315 test "$(git config branch.myr8.merge)" = refs/heads/master &&
@@ -320,7 +320,7 @@ test_expect_success 'autosetuprebase unconfigured on a tracked remote branch' '
320 git config --unset branch.autosetuprebase &&
321 git config remote.local.url . &&
322 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
323 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
323 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
324 git branch --track myr9 local/master &&
325 test "$(git config branch.myr9.remote)" = local &&
326 test "$(git config branch.myr9.merge)" = refs/heads/master &&
@@ -330,7 +330,7 @@ test_expect_success 'autosetuprebase unconfigured on a tracked remote branch' '
330 test_expect_success 'autosetuprebase unconfigured on a tracked local branch' '
331 git config remote.local.url . &&
332 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
333 - (git show-ref -q refs/remotes/local/o || git-fetch local) &&
333 + (git show-ref -q refs/remotes/local/o || git fetch local) &&
334 git branch mybase10 &&
335 git branch --track myr10 mybase2 &&
336 test "$(git config branch.myr10.remote)" = . &&
@@ -341,7 +341,7 @@ test_expect_success 'autosetuprebase unconfigured on a tracked local branch' '
341 test_expect_success 'autosetuprebase unconfigured on untracked local branch' '
342 git config remote.local.url . &&
343 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
344 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
344 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
345 git branch --no-track myr11 mybase2 &&
346 test "z$(git config branch.myr11.remote)" = z &&
347 test "z$(git config branch.myr11.merge)" = z &&
@@ -351,7 +351,7 @@ test_expect_success 'autosetuprebase unconfigured on untracked local branch' '
351 test_expect_success 'autosetuprebase unconfigured on untracked remote branch' '
352 git config remote.local.url . &&
353 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
354 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
354 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
355 git branch --no-track myr12 local/master &&
356 test "z$(git config branch.myr12.remote)" = z &&
357 test "z$(git config branch.myr12.merge)" = z &&
@@ -362,7 +362,7 @@ test_expect_success 'autosetuprebase never on an untracked local branch' '
362 git config branch.autosetuprebase never &&
363 git config remote.local.url . &&
364 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
365 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
365 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
366 git branch --no-track myr13 mybase2 &&
367 test "z$(git config branch.myr13.remote)" = z &&
368 test "z$(git config branch.myr13.merge)" = z &&
@@ -373,7 +373,7 @@ test_expect_success 'autosetuprebase local on an untracked local branch' '
373 git config branch.autosetuprebase local &&
374 git config remote.local.url . &&
375 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
376 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
376 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
377 git branch --no-track myr14 mybase2 &&
378 test "z$(git config branch.myr14.remote)" = z &&
379 test "z$(git config branch.myr14.merge)" = z &&
@@ -384,7 +384,7 @@ test_expect_success 'autosetuprebase remote on an untracked local branch' '
384 git config branch.autosetuprebase remote &&
385 git config remote.local.url . &&
386 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
387 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
387 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
388 git branch --no-track myr15 mybase2 &&
389 test "z$(git config branch.myr15.remote)" = z &&
390 test "z$(git config branch.myr15.merge)" = z &&
@@ -395,7 +395,7 @@ test_expect_success 'autosetuprebase always on an untracked local branch' '
395 git config branch.autosetuprebase always &&
396 git config remote.local.url . &&
397 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
398 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
398 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
399 git branch --no-track myr16 mybase2 &&
400 test "z$(git config branch.myr16.remote)" = z &&
401 test "z$(git config branch.myr16.merge)" = z &&
@@ -406,7 +406,7 @@ test_expect_success 'autosetuprebase never on an untracked remote branch' '
406 git config branch.autosetuprebase never &&
407 git config remote.local.url . &&
408 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
409 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
409 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
410 git branch --no-track myr17 local/master &&
411 test "z$(git config branch.myr17.remote)" = z &&
412 test "z$(git config branch.myr17.merge)" = z &&
@@ -417,7 +417,7 @@ test_expect_success 'autosetuprebase local on an untracked remote branch' '
417 git config branch.autosetuprebase local &&
418 git config remote.local.url . &&
419 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
420 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
420 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
421 git branch --no-track myr18 local/master &&
422 test "z$(git config branch.myr18.remote)" = z &&
423 test "z$(git config branch.myr18.merge)" = z &&
@@ -428,7 +428,7 @@ test_expect_success 'autosetuprebase remote on an untracked remote branch' '
428 git config branch.autosetuprebase remote &&
429 git config remote.local.url . &&
430 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
431 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
431 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
432 git branch --no-track myr19 local/master &&
433 test "z$(git config branch.myr19.remote)" = z &&
434 test "z$(git config branch.myr19.merge)" = z &&
@@ -439,7 +439,7 @@ test_expect_success 'autosetuprebase always on an untracked remote branch' '
439 git config branch.autosetuprebase always &&
440 git config remote.local.url . &&
441 git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
442 - (git show-ref -q refs/remotes/local/master || git-fetch local) &&
442 + (git show-ref -q refs/remotes/local/master || git fetch local) &&
443 git branch --no-track myr20 local/master &&
444 test "z$(git config branch.myr20.remote)" = z &&
445 test "z$(git config branch.myr20.merge)" = z &&
t/t3210-pack-refs.sh
+2 -2
@@ -17,7 +17,7 @@ test_expect_success \
17 'prepare a trivial repository' \
18 'echo Hello > A &&
19 git update-index --add A &&
20 - git-commit -m "Initial commit." &&
20 + git commit -m "Initial commit." &&
21 HEAD=$(git rev-parse --verify HEAD)'
22
23 SHA1=
@@ -97,7 +97,7 @@ test_expect_success \
97 git branch n'
98
99 test_expect_success 'pack, prune and repack' '
100 - git-tag foo &&
100 + git tag foo &&
101 git pack-refs --all --prune &&
102 git show-ref >all-of-them &&
103 git pack-refs &&
t/t3400-rebase.sh
+3 -3
@@ -16,15 +16,15 @@ test_expect_success \
16 'prepare repository with topic branches' \
17 'echo First > A &&
18 git update-index --add A &&
19 - git-commit -m "Add A." &&
19 + git commit -m "Add A." &&
20 git checkout -b my-topic-branch &&
21 echo Second > B &&
22 git update-index --add B &&
23 - git-commit -m "Add B." &&
23 + git commit -m "Add B." &&
24 git checkout -f master &&
25 echo Third >> A &&
26 git update-index A &&
27 - git-commit -m "Modify A." &&
27 + git commit -m "Modify A." &&
28 git checkout -b side my-topic-branch &&
29 echo Side >> C &&
30 git add C &&
t/t3401-rebase-partial.sh
+11 -11
@@ -15,29 +15,29 @@ test_expect_success \
15 'prepare repository with topic branch' \
16 'echo First > A &&
17 git update-index --add A &&
18 - git-commit -m "Add A." &&
18 + git commit -m "Add A." &&
19
20 - git-checkout -b my-topic-branch &&
20 + git checkout -b my-topic-branch &&
21
22 echo Second > B &&
23 git update-index --add B &&
24 - git-commit -m "Add B." &&
24 + git commit -m "Add B." &&
25
26 echo AnotherSecond > C &&
27 git update-index --add C &&
28 - git-commit -m "Add C." &&
28 + git commit -m "Add C." &&
29
30 - git-checkout -f master &&
30 + git checkout -f master &&
31
32 echo Third >> A &&
33 git update-index A &&
34 - git-commit -m "Modify A."
34 + git commit -m "Modify A."
35 '
36
37 test_expect_success \
38 'pick top patch from topic branch into master' \
39 'git cherry-pick my-topic-branch^0 &&
40 - git-checkout -f my-topic-branch &&
40 + git checkout -f my-topic-branch &&
41 git branch master-merge master &&
42 git branch my-topic-branch-merge my-topic-branch
43 '
@@ -49,13 +49,13 @@ test_debug \
49 '
50
51 test_expect_success \
52 - 'rebase topic branch against new master and check git-am did not get halted' \
53 - 'git-rebase master && test ! -d .git/rebase-apply'
52 + 'rebase topic branch against new master and check git am did not get halted' \
53 + 'git rebase master && test ! -d .git/rebase-apply'
54
55 test_expect_success \
56 'rebase --merge topic branch that was partially merged upstream' \
57 - 'git-checkout -f my-topic-branch-merge &&
58 - git-rebase --merge master-merge &&
57 + 'git checkout -f my-topic-branch-merge &&
58 + git rebase --merge master-merge &&
59 test ! -d .git/rebase-merge'
60
61 test_done
t/t3403-rebase-skip.sh
+1 -1
@@ -7,7 +7,7 @@ test_description='git rebase --merge --skip tests'
7
8 . ./test-lib.sh
9
10 -# we assume the default git-am -3 --skip strategy is tested independently
10 +# we assume the default git am -3 --skip strategy is tested independently
11 # and always works :)
12
13 test_expect_success setup '
t/t3404-rebase-interactive.sh
+1 -1
@@ -161,7 +161,7 @@ test_expect_success 'stop on conflicting pick' '
161 test "$(git rev-parse HEAD~3)" = "$(git rev-parse master)" &&
162 test_cmp expect .git/rebase-merge/patch &&
163 test_cmp expect2 file1 &&
164 - test "$(git-diff --name-status |
164 + test "$(git diff --name-status |
165 sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 &&
166 test 4 = $(grep -v "^#" < .git/rebase-merge/done | wc -l) &&
167 test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo)
t/t3407-rebase-abort.sh
+1 -1
@@ -52,7 +52,7 @@ testrebase() {
52 test -d "$dotest" &&
53 test_must_fail git rebase --skip &&
54 test $(git rev-parse HEAD) = $(git rev-parse master) &&
55 - git-rebase --abort &&
55 + git rebase --abort &&
56 test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
57 test ! -d "$dotest"
58 '
t/t3500-cherry.sh
+6 -6
@@ -17,25 +17,25 @@ test_expect_success \
17 'prepare repository with topic branch, and check cherry finds the 2 patches from there' \
18 'echo First > A &&
19 git update-index --add A &&
20 - git-commit -m "Add A." &&
20 + git commit -m "Add A." &&
21
22 - git-checkout -b my-topic-branch &&
22 + git checkout -b my-topic-branch &&
23
24 echo Second > B &&
25 git update-index --add B &&
26 - git-commit -m "Add B." &&
26 + git commit -m "Add B." &&
27
28 sleep 2 &&
29 echo AnotherSecond > C &&
30 git update-index --add C &&
31 - git-commit -m "Add C." &&
31 + git commit -m "Add C." &&
32
33 - git-checkout -f master &&
33 + git checkout -f master &&
34 rm -f B C &&
35
36 echo Third >> A &&
37 git update-index A &&
38 - git-commit -m "Modify A." &&
38 + git commit -m "Modify A." &&
39
40 expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* + .*"
41 '
t/t3800-mktag.sh
+6 -6
@@ -2,7 +2,7 @@
2 #
3 #
4
5 -test_description='git-mktag: tag object verify test'
5 +test_description='git mktag: tag object verify test'
6
7 . ./test-lib.sh
8
@@ -14,7 +14,7 @@ test_description='git-mktag: tag object verify test'
14 check_verify_failure () {
15 expect="$2"
16 test_expect_success "$1" '
17 - ( test_must_fail git-mktag <tag.sig 2>message ) &&
17 + ( test_must_fail git mktag <tag.sig 2>message ) &&
18 grep "$expect" message
19 '
20 }
@@ -24,7 +24,7 @@ check_verify_failure () {
24 # for the tag.
25 echo Hello >A
26 git update-index --add A
27 -git-commit -m "Initial commit"
27 +git commit -m "Initial commit"
28 head=$(git rev-parse --verify HEAD)
29
30 ############################################################
@@ -222,7 +222,7 @@ EOF
222
223 test_expect_success \
224 'allow empty tag email' \
225 - 'git-mktag <tag.sig >.git/refs/tags/mytag 2>message'
225 + 'git mktag <tag.sig >.git/refs/tags/mytag 2>message'
226
227 ############################################################
228 # 16. disallow spaces in tag email
@@ -350,14 +350,14 @@ EOF
350
351 test_expect_success \
352 'create valid tag' \
353 - 'git-mktag <tag.sig >.git/refs/tags/mytag 2>message'
353 + 'git mktag <tag.sig >.git/refs/tags/mytag 2>message'
354
355 ############################################################
356 # 25. check mytag
357
358 test_expect_success \
359 'check mytag' \
360 - 'git-tag -l | grep mytag'
360 + 'git tag -l | grep mytag'
361
362
363 test_done
t/t3900-i18n-commit.sh
+3 -3
@@ -18,7 +18,7 @@ test_expect_success setup '
18 T=$(git write-tree) &&
19 C=$(git commit-tree $T <../t3900/1-UTF-8.txt) &&
20 git update-ref HEAD $C &&
21 - git-tag C0
21 + git tag C0
22 '
23
24 test_expect_success 'no encoding header for base case' '
@@ -30,9 +30,9 @@ for H in ISO-8859-1 EUCJP ISO-2022-JP
30 do
31 test_expect_success "$H setup" '
32 git config i18n.commitencoding $H &&
33 - git-checkout -b $H C0 &&
33 + git checkout -b $H C0 &&
34 echo $H >F &&
35 - git-commit -a -F ../t3900/$H.txt
35 + git commit -a -F ../t3900/$H.txt
36 '
37 done
38
t/t3901-i18n-patch.sh
+8 -8
@@ -103,7 +103,7 @@ test_expect_success 'rebase (U/U)' '
103 # we want UTF-8 encoded name.
104 . ../t3901-utf8.txt &&
105 git checkout -b test &&
106 - git-rebase master &&
106 + git rebase master &&
107
108 check_encoding 2
109 '
@@ -114,7 +114,7 @@ test_expect_success 'rebase (U/L)' '
114 . ../t3901-utf8.txt &&
115
116 git reset --hard side &&
117 - git-rebase master &&
117 + git rebase master &&
118
119 check_encoding 2
120 '
@@ -126,7 +126,7 @@ test_expect_success 'rebase (L/L)' '
126 . ../t3901-8859-1.txt &&
127
128 git reset --hard side &&
129 - git-rebase master &&
129 + git rebase master &&
130
131 check_encoding 2 8859
132 '
@@ -139,7 +139,7 @@ test_expect_success 'rebase (L/U)' '
139 . ../t3901-8859-1.txt &&
140
141 git reset --hard side &&
142 - git-rebase master &&
142 + git rebase master &&
143
144 check_encoding 2 8859
145 '
@@ -211,7 +211,7 @@ test_expect_success 'rebase --merge (U/U)' '
211 . ../t3901-utf8.txt &&
212
213 git reset --hard side &&
214 - git-rebase --merge master &&
214 + git rebase --merge master &&
215
216 check_encoding 2
217 '
@@ -222,7 +222,7 @@ test_expect_success 'rebase --merge (U/L)' '
222 . ../t3901-utf8.txt &&
223
224 git reset --hard side &&
225 - git-rebase --merge master &&
225 + git rebase --merge master &&
226
227 check_encoding 2
228 '
@@ -234,7 +234,7 @@ test_expect_success 'rebase --merge (L/L)' '
234 . ../t3901-8859-1.txt &&
235
236 git reset --hard side &&
237 - git-rebase --merge master &&
237 + git rebase --merge master &&
238
239 check_encoding 2 8859
240 '
@@ -247,7 +247,7 @@ test_expect_success 'rebase --merge (L/U)' '
247 . ../t3901-8859-1.txt &&
248
249 git reset --hard side &&
250 - git-rebase --merge master &&
250 + git rebase --merge master &&
251
252 check_encoding 2 8859
253 '
t/t3903-stash.sh
+1 -1
@@ -3,7 +3,7 @@
3 # Copyright (c) 2007 Johannes E Schindelin
4 #
5
6 -test_description='Test git-stash'
6 +test_description='Test git stash'
7
8 . ./test-lib.sh
9