undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'as/test-name-alias-uniquely'

Browse Source 
A few short-and-bland aliases used in the tests were interfering
with git-custom command in user's $PATH.

* as/test-name-alias-uniquely:
  Use longer alias names in subdirectory tests
This commit is contained in:
Junio C Hamano 2013-01-08 13:23:21 -08:00
commit 8d1b1a0249
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
t/t1020-subdirectory.sh
View File

@ -111,19 +111,19 @@ test_expect_success 'read-tree' '
test_expect_success 'alias expansion' ' test_expect_success 'alias expansion' '
( (
git config alias.ss status && git config alias.test-status-alias status &&
cd dir && cd dir &&
git status && git status &&
git ss git test-status-alias
) )
' '
test_expect_success NOT_MINGW '!alias expansion' ' test_expect_success NOT_MINGW '!alias expansion' '
pwd >expect && pwd >expect &&
( (
git config alias.test !pwd && git config alias.test-alias-directory !pwd &&
cd dir && cd dir &&
git test >../actual git test-alias-directory >../actual
) && ) &&
test_cmp expect actual test_cmp expect actual
' '
@ -131,9 +131,9 @@ test_expect_success NOT_MINGW '!alias expansion' '
test_expect_success 'GIT_PREFIX for !alias' ' test_expect_success 'GIT_PREFIX for !alias' '
printf "dir/" >expect && printf "dir/" >expect &&
( (
git config alias.test "!sh -c \"printf \$GIT_PREFIX\"" && git config alias.test-alias-directory "!sh -c \"printf \$GIT_PREFIX\"" &&
cd dir && cd dir &&
git test >../actual git test-alias-directory >../actual
) && ) &&
test_cmp expect actual test_cmp expect actual
' '