development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-05 16:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: use "git xyzzy" form (t7200 - t9001)

Browse source 
Converts tests between t7201-t9001.

Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nanako Shiraishi 2008-09-03 17:59:33 +09:00 committed by Junio C Hamano
parent d592b3157f
commit 47a528ad24
18 changed files with 99 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
t/t7201-co.sh
View file

@ -3,7 +3,7 @@
# Copyright (c) 2006 Junio C Hamano
#
test_description='git-checkout tests.
test_description='git checkout tests.
Creates master, forks renamer and side branches from it.
Test switching across them.

72
t/t7300-clean.sh
View file

@ -3,7 +3,7 @@
# Copyright (c) 2007 Michael Spang
#
test_description='git-clean basic tests'
test_description='git clean basic tests'
. ./test-lib.sh
@ -16,17 +16,17 @@ test_expect_success 'setup' '
echo build >.gitignore &&
echo \*.o >>.gitignore &&
git add . &&
git-commit -m setup &&
git commit -m setup &&
touch src/part2.c README &&
git add .
'
test_expect_success 'git-clean' '
test_expect_success 'git clean' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git-clean &&
git clean &&
test -f Makefile &&
test -f README &&
test -f src/part1.c &&
@ -39,11 +39,11 @@ test_expect_success 'git-clean' '
'
test_expect_success 'git-clean src/' '
test_expect_success 'git clean src/' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git-clean src/ &&
git clean src/ &&
test -f Makefile &&
test -f README &&
test -f src/part1.c &&
@ -56,11 +56,11 @@ test_expect_success 'git-clean src/' '
'
test_expect_success 'git-clean src/ src/' '
test_expect_success 'git clean src/ src/' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git-clean src/ src/ &&
git clean src/ src/ &&
test -f Makefile &&
test -f README &&
test -f src/part1.c &&
@ -73,11 +73,11 @@ test_expect_success 'git-clean src/ src/' '
'
test_expect_success 'git-clean with prefix' '
test_expect_success 'git clean with prefix' '
mkdir -p build docs src/test &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so src/test/1.c &&
(cd src/ && git-clean) &&
(cd src/ && git clean) &&
test -f Makefile &&
test -f README &&
test -f src/part1.c &&
@ -91,7 +91,7 @@ test_expect_success 'git-clean with prefix' '
'
test_expect_success 'git-clean with relative prefix' '
test_expect_success 'git clean with relative prefix' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
@ -106,7 +106,7 @@ test_expect_success 'git-clean with relative prefix' '
}
'
test_expect_success 'git-clean with absolute path' '
test_expect_success 'git clean with absolute path' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
@ -121,7 +121,7 @@ test_expect_success 'git-clean with absolute path' '
}
'
test_expect_success 'git-clean with out of work tree relative path' '
test_expect_success 'git clean with out of work tree relative path' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
@ -131,7 +131,7 @@ test_expect_success 'git-clean with out of work tree relative path' '
)
'
test_expect_success 'git-clean with out of work tree absolute path' '
test_expect_success 'git clean with out of work tree absolute path' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
@ -142,11 +142,11 @@ test_expect_success 'git-clean with out of work tree absolute path' '
)
'
test_expect_success 'git-clean -d with prefix and path' '
test_expect_success 'git clean -d with prefix and path' '
mkdir -p build docs src/feature &&
touch a.out src/part3.c src/feature/file.c docs/manual.txt obj.o build/lib.so &&
(cd src/ && git-clean -d feature/) &&
(cd src/ && git clean -d feature/) &&
test -f Makefile &&
test -f README &&
test -f src/part1.c &&
@ -160,12 +160,12 @@ test_expect_success 'git-clean -d with prefix and path' '
'
test_expect_success 'git-clean symbolic link' '
test_expect_success 'git clean symbolic link' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
ln -s docs/manual.txt src/part4.c
git-clean &&
git clean &&
test -f Makefile &&
test -f README &&
test -f src/part1.c &&
@ -179,10 +179,10 @@ test_expect_success 'git-clean symbolic link' '
'
test_expect_success 'git-clean with wildcard' '
test_expect_success 'git clean with wildcard' '
touch a.clean b.clean other.c &&
git-clean "*.clean" &&
git clean "*.clean" &&
test -f Makefile &&
test -f README &&
test -f src/part1.c &&
@ -193,11 +193,11 @@ test_expect_success 'git-clean with wildcard' '
'
test_expect_success 'git-clean -n' '
test_expect_success 'git clean -n' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git-clean -n &&
git clean -n &&
test -f Makefile &&
test -f README &&
test -f src/part1.c &&
@ -210,11 +210,11 @@ test_expect_success 'git-clean -n' '
'
test_expect_success 'git-clean -d' '
test_expect_success 'git clean -d' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git-clean -d &&
git clean -d &&
test -f Makefile &&
test -f README &&
test -f src/part1.c &&
@ -227,11 +227,11 @@ test_expect_success 'git-clean -d' '
'
test_expect_success 'git-clean -d src/ examples/' '
test_expect_success 'git clean -d src/ examples/' '
mkdir -p build docs examples &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so examples/1.c &&
git-clean -d src/ examples/ &&
git clean -d src/ examples/ &&
test -f Makefile &&
test -f README &&
test -f src/part1.c &&
@ -245,11 +245,11 @@ test_expect_success 'git-clean -d src/ examples/' '
'
test_expect_success 'git-clean -x' '
test_expect_success 'git clean -x' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git-clean -x &&
git clean -x &&
test -f Makefile &&
test -f README &&
test -f src/part1.c &&
@ -262,11 +262,11 @@ test_expect_success 'git-clean -x' '
'
test_expect_success 'git-clean -d -x' '
test_expect_success 'git clean -d -x' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git-clean -d -x &&
git clean -d -x &&
test -f Makefile &&
test -f README &&
test -f src/part1.c &&
@ -279,11 +279,11 @@ test_expect_success 'git-clean -d -x' '
'
test_expect_success 'git-clean -X' '
test_expect_success 'git clean -X' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git-clean -X &&
git clean -X &&
test -f Makefile &&
test -f README &&
test -f src/part1.c &&
@ -296,11 +296,11 @@ test_expect_success 'git-clean -X' '
'
test_expect_success 'git-clean -d -X' '
test_expect_success 'git clean -d -X' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git-clean -d -X &&
git clean -d -X &&
test -f Makefile &&
test -f README &&
test -f src/part1.c &&
@ -331,7 +331,7 @@ test_expect_success 'clean.requireForce and -n' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git-clean -n &&
git clean -n &&
test -f Makefile &&
test -f README &&
test -f src/part1.c &&
@ -346,7 +346,7 @@ test_expect_success 'clean.requireForce and -n' '
test_expect_success 'clean.requireForce and -f' '
git-clean -f &&
git clean -f &&
test -f README &&
test -f src/part1.c &&
test -f src/part2.c &&

48
t/t7400-submodule-basic.sh
View file

@ -6,7 +6,7 @@
test_description='Basic porcelain support for submodules
This test tries to verify basic sanity of the init, update and status
subcommands of git-submodule.
subcommands of git submodule.
'
. ./test-lib.sh
@ -22,16 +22,16 @@ subcommands of git-submodule.
#
test_expect_success 'Prepare submodule testing' '
: > t &&
git-add t &&
git-commit -m "initial commit" &&
git add t &&
git commit -m "initial commit" &&
git branch initial HEAD &&
mkdir init &&
cd init &&
git init &&
echo a >a &&
git add a &&
git-commit -m "submodule commit 1" &&
git-tag -a -m "rev-1" rev-1 &&
git commit -m "submodule commit 1" &&
git tag -a -m "rev-1" rev-1 &&
rev1=$(git rev-parse HEAD) &&
if test -z "$rev1"
then
@ -42,13 +42,13 @@ test_expect_success 'Prepare submodule testing' '
echo a >a &&
echo z >z &&
git add a init z &&
git-commit -m "super commit 1" &&
git commit -m "super commit 1" &&
mv init .subrepo &&
GIT_CONFIG=.gitmodules git config submodule.example.url git://example.com/init.git
'
test_expect_success 'status should fail for unmapped paths' '
if git-submodule status
if git submodule status
then
echo "[OOPS] submodule status succeeded"
false
@ -60,16 +60,16 @@ test_expect_success 'status should fail for unmapped paths' '
'
test_expect_success 'status should only print one line' '
lines=$(git-submodule status | wc -l) &&
lines=$(git submodule status | wc -l) &&
test $lines = 1
'
test_expect_success 'status should initially be "missing"' '
git-submodule status | grep "^-$rev1"
git submodule status | grep "^-$rev1"
'
test_expect_success 'init should register submodule url in .git/config' '
git-submodule init &&
git submodule init &&
url=$(git config submodule.example.url) &&
if test "$url" != "git://example.com/init.git"
then
@ -84,7 +84,7 @@ test_expect_success 'init should register submodule url in .git/config' '
test_expect_success 'update should fail when path is used by a file' '
echo "hello" >init &&
if git-submodule update
if git submodule update
then
echo "[OOPS] update should have failed"
false
@ -100,7 +100,7 @@ test_expect_success 'update should fail when path is used by a file' '
test_expect_success 'update should fail when path is used by a nonempty directory' '
mkdir init &&
echo "hello" >init/a &&
if git-submodule update
if git submodule update
then
echo "[OOPS] update should have failed"
false
@ -116,7 +116,7 @@ test_expect_success 'update should fail when path is used by a nonempty director
test_expect_success 'update should work when path is an empty dir' '
rm -rf init &&
mkdir init &&
git-submodule update &&
git submodule update &&
head=$(cd init && git rev-parse HEAD) &&
if test -z "$head"
then
@ -130,14 +130,14 @@ test_expect_success 'update should work when path is an empty dir' '
'
test_expect_success 'status should be "up-to-date" after update' '
git-submodule status | grep "^ $rev1"
git submodule status | grep "^ $rev1"
'
test_expect_success 'status should be "modified" after submodule commit' '
cd init &&
echo b >b &&
git add b &&
git-commit -m "submodule commit 2" &&
git commit -m "submodule commit 2" &&
rev2=$(git rev-parse HEAD) &&
cd .. &&
if test -z "$rev2"
@ -145,19 +145,19 @@ test_expect_success 'status should be "modified" after submodule commit' '
echo "[OOPS] submodule git rev-parse returned nothing"
false
fi &&
git-submodule status | grep "^+$rev2"
git submodule status | grep "^+$rev2"
'
test_expect_success 'the --cached sha1 should be rev1' '
git-submodule --cached status | grep "^+$rev1"
git submodule --cached status | grep "^+$rev1"
'
test_expect_success 'git diff should report the SHA1 of the new submodule commit' '
git-diff | grep "^+Subproject commit $rev2"
git diff | grep "^+Subproject commit $rev2"
'
test_expect_success 'update should checkout rev1' '
git-submodule update init &&
git submodule update init &&
head=$(cd init && git rev-parse HEAD) &&
if test -z "$head"
then
@ -171,12 +171,12 @@ test_expect_success 'update should checkout rev1' '
'
test_expect_success 'status should be "up-to-date" after update' '
git-submodule status | grep "^ $rev1"
git submodule status | grep "^ $rev1"
'
test_expect_success 'checkout superproject with subproject already present' '
git-checkout initial &&
git-checkout master
git checkout initial &&
git checkout master
'
test_expect_success 'apply submodule diff' '
@ -188,8 +188,8 @@ test_expect_success 'apply submodule diff' '
git commit -m "change subproject"
) &&
git update-index --add init &&
git-commit -m "change init" &&
git-format-patch -1 --stdout >P.diff &&
git commit -m "change init" &&
git format-patch -1 --stdout >P.diff &&
git checkout second &&
git apply --index P.diff &&
D=$(git diff --cached master) &&

2
t/t7401-submodule-summary.sh
View file

@ -5,7 +5,7 @@
test_description='Summary support for submodules
This test tries to verify the sanity of summary subcommand of git-submodule.
This test tries to verify the sanity of summary subcommand of git submodule.
'
. ./test-lib.sh

2
t/t7500-commit.sh
View file

@ -3,7 +3,7 @@
# Copyright (c) 2007 Steven Grimm
#
test_description='git-commit
test_description='git commit
Tests for selected commit options.'

48
t/t7501-commit.sh
View file

@ -6,7 +6,7 @@
# FIXME: Test the various index usages, -i and -o, test reflog,
# signoff
test_description='git-commit'
test_description='git commit'
. ./test-lib.sh
test_tick
@ -14,52 +14,52 @@ test_tick
test_expect_success \
"initial status" \
"echo 'bongo bongo' >file &&
git-add file && \
git-status | grep 'Initial commit'"
git add file && \
git status | grep 'Initial commit'"
test_expect_success \
"fail initial amend" \
"test_must_fail git-commit --amend"
"test_must_fail git commit --amend"
test_expect_success \
"initial commit" \
"git-commit -m initial"
"git commit -m initial"
test_expect_success \
"invalid options 1" \
"test_must_fail git-commit -m foo -m bar -F file"
"test_must_fail git commit -m foo -m bar -F file"
test_expect_success \
"invalid options 2" \
"test_must_fail git-commit -C HEAD -m illegal"
"test_must_fail git commit -C HEAD -m illegal"
test_expect_success \
"using paths with -a" \
"echo King of the bongo >file &&
test_must_fail git-commit -m foo -a file"
test_must_fail git commit -m foo -a file"
test_expect_success \
"using paths with --interactive" \
"echo bong-o-bong >file &&
! (echo 7 | git-commit -m foo --interactive file)"
! (echo 7 | git commit -m foo --interactive file)"
test_expect_success \
"using invalid commit with -C" \
"test_must_fail git-commit -C bogus"
"test_must_fail git commit -C bogus"
test_expect_success \
"testing nothing to commit" \
"test_must_fail git-commit -m initial"
"test_must_fail git commit -m initial"
test_expect_success \
"next commit" \
"echo 'bongo bongo bongo' >file \
git-commit -m next -a"
git commit -m next -a"
test_expect_success \
"commit message from non-existing file" \
"echo 'more bongo: bongo bongo bongo bongo' >file && \
test_must_fail git-commit -F gah -a"
test_must_fail git commit -F gah -a"
# Empty except stray tabs and spaces on a few lines.
sed -e 's/@$//' >msg <<EOF
@ -70,12 +70,12 @@ Signed-off-by: hula
EOF
test_expect_success \
"empty commit message" \
"test_must_fail git-commit -F msg -a"
"test_must_fail git commit -F msg -a"
test_expect_success \
"commit message from file" \
"echo 'this is the commit message, coming from a file' >msg && \
git-commit -F msg -a"
git commit -F msg -a"
cat >editor <<\EOF
#!/bin/sh
@ -86,16 +86,16 @@ chmod 755 editor
test_expect_success \
"amend commit" \
"VISUAL=./editor git-commit --amend"
"VISUAL=./editor git commit --amend"
test_expect_success \
"passing -m and -F" \
"echo 'enough with the bongos' >file && \
test_must_fail git-commit -F msg -m amending ."
test_must_fail git commit -F msg -m amending ."
test_expect_success \
"using message from other commit" \
"git-commit -C HEAD^ ."
"git commit -C HEAD^ ."
cat >editor <<\EOF
#!/bin/sh
@ -107,25 +107,25 @@ chmod 755 editor
test_expect_success \
"editing message from other commit" \
"echo 'hula hula' >file && \
VISUAL=./editor git-commit -c HEAD^ -a"
VISUAL=./editor git commit -c HEAD^ -a"
test_expect_success \
"message from stdin" \
"echo 'silly new contents' >file && \
echo commit message from stdin | git-commit -F - -a"
echo commit message from stdin | git commit -F - -a"
test_expect_success \
"overriding author from command line" \
"echo 'gak' >file && \
git-commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a"
git commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a"
test_expect_success \
"interactive add" \
"echo 7 | git-commit --interactive | grep 'What now'"
"echo 7 | git commit --interactive | grep 'What now'"
test_expect_success \
"showing committed revisions" \
"git-rev-list HEAD >current"
"git rev-list HEAD >current"
# We could just check the head sha1, but checking each commit makes it
# easier to isolate bugs.
@ -140,7 +140,7 @@ d381ac431806e53f3dd7ac2f1ae0534f36d738b9
EOF
test_expect_success \
'validate git-rev-list output.' \
'validate git rev-list output.' \
'diff current expected'
test_expect_success 'partial commit that involves removal (1)' '

2
t/t7502-status.sh
View file

@ -3,7 +3,7 @@
# Copyright (c) 2007 Johannes E. Schindelin
#
test_description='git-status'
test_description='git status'
. ./test-lib.sh

2
t/t7505-prepare-commit-msg-hook.sh
View file

@ -32,7 +32,7 @@ echo "#!$SHELL_PATH" > "$HOOK"
cat >> "$HOOK" <<'EOF'
if test "$2" = commit; then
source=$(git-rev-parse "$3")
source=$(git rev-parse "$3")
else
source=${2-default}
fi

2
t/t7506-status-submodule.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh
test_description='git-status for submodule'
test_description='git status for submodule'
. ./test-lib.sh

2
t/t7600-merge.sh
View file

@ -3,7 +3,7 @@
# Copyright (c) 2007 Lars Hjemli
#
test_description='git-merge
test_description='git merge
Testing basic merge operations/option parsing.'

2
t/t7601-merge-pull-config.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh
test_description='git-merge
test_description='git merge
Testing pull.* configuration parsing.'

2
t/t7602-merge-octopus-many.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh
test_description='git-merge
test_description='git merge
Testing octopus merge with more than 25 refs.'

2
t/t7603-merge-reduce-heads.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh
test_description='git-merge
test_description='git merge
Testing octopus merge when reducing parents to independent branches.'

2
t/t7604-merge-custom-message.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh
test_description='git-merge
test_description='git merge
Testing merge when using a custom message for the merge commit.'

2
t/t7605-merge-resolve.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh
test_description='git-merge
test_description='git merge
Testing the resolve strategy.'

2
t/t7610-mergetool.sh
View file

@ -3,7 +3,7 @@
# Copyright (c) 2008 Charles Bailey
#
test_description='git-mergetool
test_description='git mergetool
Testing basic merge tool invocation'

2
t/t7701-repack-unpack-unreachable.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh
test_description='git-repack works correctly'
test_description='git repack works correctly'
. ./test-lib.sh

2
t/t9001-send-email.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh
test_description='git-send-email'
test_description='git send-email'
. ./test-lib.sh
PROG='git send-email'