mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'as/test-name-alias-uniquely' into maint
* as/test-name-alias-uniquely: Use longer alias names in subdirectory tests
This commit is contained in:
commit
b88cb88158
|
@ -111,19 +111,19 @@ test_expect_success 'read-tree' '
|
|||
|
||||
test_expect_success 'alias expansion' '
|
||||
(
|
||||
git config alias.ss status &&
|
||||
git config alias.test-status-alias status &&
|
||||
cd dir &&
|
||||
git status &&
|
||||
git ss
|
||||
git test-status-alias
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success NOT_MINGW '!alias expansion' '
|
||||
pwd >expect &&
|
||||
(
|
||||
git config alias.test !pwd &&
|
||||
git config alias.test-alias-directory !pwd &&
|
||||
cd dir &&
|
||||
git test >../actual
|
||||
git test-alias-directory >../actual
|
||||
) &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
@ -131,9 +131,9 @@ test_expect_success NOT_MINGW '!alias expansion' '
|
|||
test_expect_success 'GIT_PREFIX for !alias' '
|
||||
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 &&
|
||||
git test >../actual
|
||||
git test-alias-directory >../actual
|
||||
) &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
|
Loading…
Reference in a new issue