提交 d592b315 编写于 作者: N Nanako Shiraishi 提交者: Junio C Hamano

tests: use "git xyzzy" form (t7000 - t7199)

Converts tests between t7001-t7103.
Signed-off-by: NNanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 3604e7c5
......@@ -8,7 +8,7 @@ test_expect_success \
'mkdir path0 path1 &&
cp ../../COPYING path0/COPYING &&
git add path0/COPYING &&
git-commit -m add -a'
git commit -m add -a'
test_expect_success \
'moving the file out of subdirectory' \
......@@ -17,7 +17,7 @@ test_expect_success \
# in path0 currently
test_expect_success \
'commiting the change' \
'cd .. && git-commit -m move-out -a'
'cd .. && git commit -m move-out -a'
test_expect_success \
'checking the commit' \
......@@ -31,7 +31,7 @@ test_expect_success \
# in path0 currently
test_expect_success \
'commiting the change' \
'cd .. && git-commit -m move-in -a'
'cd .. && git commit -m move-in -a'
test_expect_success \
'checking the commit' \
......@@ -42,7 +42,7 @@ test_expect_success \
'adding another file' \
'cp ../../README path0/README &&
git add path0/README &&
git-commit -m add2 -a'
git commit -m add2 -a'
test_expect_success \
'moving whole subdirectory' \
......@@ -50,7 +50,7 @@ test_expect_success \
test_expect_success \
'commiting the change' \
'git-commit -m dir-move -a'
'git commit -m dir-move -a'
test_expect_success \
'checking the commit' \
......@@ -69,7 +69,7 @@ test_expect_success \
test_expect_success \
'commiting the change' \
'git-commit -m dir-move -a'
'git commit -m dir-move -a'
test_expect_success \
'checking the commit' \
......
#!/bin/sh
test_description='git-filter-branch'
test_description='git filter-branch'
. ./test-lib.sh
make_commit () {
......@@ -32,14 +32,14 @@ test_expect_success 'setup' '
H=$(git rev-parse H)
test_expect_success 'rewrite identically' '
git-filter-branch branch
git filter-branch branch
'
test_expect_success 'result is really identical' '
test $H = $(git rev-parse HEAD)
'
test_expect_success 'rewrite bare repository identically' '
(git config core.bare true && cd .git && git-filter-branch branch)
(git config core.bare true && cd .git && git filter-branch branch)
'
git config core.bare false
test_expect_success 'result is really identical' '
......@@ -47,7 +47,7 @@ test_expect_success 'result is really identical' '
'
test_expect_success 'rewrite, renaming a specific file' '
git-filter-branch -f --tree-filter "mv d doh || :" HEAD
git filter-branch -f --tree-filter "mv d doh || :" HEAD
'
test_expect_success 'test that the file was renamed' '
......@@ -58,7 +58,7 @@ test_expect_success 'test that the file was renamed' '
'
test_expect_success 'rewrite, renaming a specific directory' '
git-filter-branch -f --tree-filter "mv dir diroh || :" HEAD
git filter-branch -f --tree-filter "mv dir diroh || :" HEAD
'
test_expect_success 'test that the directory was renamed' '
......@@ -73,7 +73,7 @@ test_expect_success 'test that the directory was renamed' '
git tag oldD HEAD~4
test_expect_success 'rewrite one branch, keeping a side branch' '
git branch modD oldD &&
git-filter-branch -f --tree-filter "mv b boh || :" D..modD
git filter-branch -f --tree-filter "mv b boh || :" D..modD
'
test_expect_success 'common ancestor is still common (unchanged)' '
......@@ -96,7 +96,7 @@ test_expect_success 'filter subdirectory only' '
test_tick &&
git commit -m "again not subdir" &&
git branch sub &&
git-filter-branch -f --subdirectory-filter subdir refs/heads/sub
git filter-branch -f --subdirectory-filter subdir refs/heads/sub
'
test_expect_success 'subdirectory filter result looks okay' '
......@@ -120,7 +120,7 @@ test_expect_success 'more setup' '
test_expect_success 'use index-filter to move into a subdirectory' '
git branch directorymoved &&
git-filter-branch -f --index-filter \
git filter-branch -f --index-filter \
"git ls-files -s | sed \"s-\\t-&newsubdir/-\" |
GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
git update-index --index-info &&
......@@ -129,7 +129,7 @@ test_expect_success 'use index-filter to move into a subdirectory' '
test_expect_success 'stops when msg filter fails' '
old=$(git rev-parse HEAD) &&
test_must_fail git-filter-branch -f --msg-filter false HEAD &&
test_must_fail git filter-branch -f --msg-filter false HEAD &&
test $old = $(git rev-parse HEAD) &&
rm -rf .git-rewrite
'
......@@ -140,7 +140,7 @@ test_expect_success 'author information is preserved' '
test_tick &&
GIT_AUTHOR_NAME="B V Uips" git commit -m bvuips &&
git branch preserved-author &&
git-filter-branch -f --msg-filter "cat; \
git filter-branch -f --msg-filter "cat; \
test \$GIT_COMMIT != $(git rev-parse master) || \
echo Hallo" \
preserved-author &&
......@@ -152,7 +152,7 @@ test_expect_success "remove a certain author's commits" '
test_tick &&
git commit -m i i &&
git branch removed-author &&
git-filter-branch -f --commit-filter "\
git filter-branch -f --commit-filter "\
if [ \"\$GIT_AUTHOR_NAME\" = \"B V Uips\" ];\
then\
skip_commit \"\$@\";
......
此差异已折叠。
......@@ -3,7 +3,7 @@
# Copyright (c) 2006 Shawn Pearce
#
test_description='git-reset should cull empty subdirs'
test_description='git reset should cull empty subdirs'
. ./test-lib.sh
test_expect_success \
......@@ -11,7 +11,7 @@ test_expect_success \
'mkdir path0 &&
cp ../../COPYING path0/COPYING &&
git add path0/COPYING &&
git-commit -m add -a'
git commit -m add -a'
test_expect_success \
'creating second files' \
......@@ -25,11 +25,11 @@ test_expect_success \
git add path1/COPYING &&
git add COPYING &&
git add path0/COPYING-TOO &&
git-commit -m change -a'
git commit -m change -a'
test_expect_success \
'resetting tree HEAD^' \
'git-reset --hard HEAD^'
'git reset --hard HEAD^'
test_expect_success \
'checking initial files exist after rewind' \
......
......@@ -3,9 +3,9 @@
# Copyright (c) 2007 Carlos Rica
#
test_description='git-reset
test_description='git reset
Documented tests for git-reset'
Documented tests for git reset'
. ./test-lib.sh
......
#!/bin/sh
test_description='git-reset in a bare repository'
test_description='git reset in a bare repository'
. ./test-lib.sh
test_expect_success 'setup non-bare' '
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册