Skip to content

Commit

Permalink
t3409 t4107 t7406 t9150: use dashless commands
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matthew Ogilvie authored and Junio C Hamano committed Nov 30, 2009
1 parent 42ac496 commit 5d59a40
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions t/t3409-rebase-preserve-merges.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down
20 changes: 10 additions & 10 deletions t/t4107-apply-ignore-whitespace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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' '
Expand All @@ -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 changes: 2 additions & 2 deletions t/t7406-submodule-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion t/t9150-svk-mergetickets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 5d59a40

Please sign in to comment.