mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-28 04:23:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

t3409 t4107 t7406 t9150: use dashless commands

Browse Source 
This is needed to allow test suite to run against a standard
install bin directory instead of GIT_EXEC_PATH.

Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthew Ogilvie 2009-11-28 11:38:55 -07:00 committed by Junio C Hamano
parent 42ac496edc
commit 5d59a4016b
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/t3409-rebase-preserve-merges.sh
View File

@ -32,14 +32,14 @@ export GIT_AUTHOR_EMAIL
test_expect_success 'setup for merge-preserving rebase' \
'echo First > A &&
git add A &&
git-commit -m "Add A1" &&
git commit -m "Add A1" &&
git checkout -b topic &&
echo Second > B &&
git add B &&
git-commit -m "Add B1" &&
git commit -m "Add B1" &&
git checkout -f master &&
echo Third >> A &&
git-commit -a -m "Modify A2" &&
git commit -a -m "Modify A2" &&
git clone ./. clone1 &&
cd clone1 &&

20
t/t4107-apply-ignore-whitespace.sh
View File

@ -136,37 +136,37 @@ void print_int(int num) {
EOF
test_expect_success 'file creation' '
git-apply patch1.patch
git apply patch1.patch
'
test_expect_success 'patch2 fails (retab)' '
test_must_fail git-apply patch2.patch
test_must_fail git apply patch2.patch
'
test_expect_success 'patch2 applies with --ignore-whitespace' '
git-apply --ignore-whitespace patch2.patch
git apply --ignore-whitespace patch2.patch
'
test_expect_success 'patch2 reverse applies with --ignore-space-change' '
git-apply -R --ignore-space-change patch2.patch
git apply -R --ignore-space-change patch2.patch
'
git config apply.ignorewhitespace change
test_expect_success 'patch2 applies (apply.ignorewhitespace = change)' '
git-apply patch2.patch
git apply patch2.patch
'
test_expect_success 'patch3 fails (missing string at EOL)' '
test_must_fail git-apply patch3.patch
test_must_fail git apply patch3.patch
'
test_expect_success 'patch4 fails (missing EOL at EOF)' '
test_must_fail git-apply patch4.patch
test_must_fail git apply patch4.patch
'
test_expect_success 'patch5 applies (leading whitespace)' '
git-apply patch5.patch
git apply patch5.patch
'
test_expect_success 'patches do not mangle whitespace' '
@ -175,11 +175,11 @@ test_expect_success 'patches do not mangle whitespace' '
test_expect_success 're-create file (with --ignore-whitespace)' '
rm -f main.c &&
git-apply patch1.patch
git apply patch1.patch
'
test_expect_success 'patch5 fails (--no-ignore-whitespace)' '
test_must_fail git-apply --no-ignore-whitespace patch5.patch
test_must_fail git apply --no-ignore-whitespace patch5.patch
'
test_done

4
t/t7406-submodule-update.sh
View File

@ -14,8 +14,8 @@ submodule and "git submodule update --rebase/--merge" does not detach the HEAD.
compare_head()
{
sha_master=`git-rev-list --max-count=1 master`
sha_head=`git-rev-list --max-count=1 HEAD`
sha_master=`git rev-list --max-count=1 master`
sha_head=`git rev-list --max-count=1 HEAD`
test "$sha_master" = "$sha_head"
}

2
t/t9150-svk-mergetickets.sh
View File

@ -18,7 +18,7 @@ test_expect_success 'load svk depot' "
uuid=b48289b2-9c08-4d72-af37-0358a40b9c15
test_expect_success 'svk merges were represented coming in' "
[ `git-cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
[ `git cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
"
test_done