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

Use longer alias names in subdirectory tests

Browse Source 
When testing aliases in t/t1020-subdirectory.sh use longer names so that
they're less likely to conflict with a git-* command somewhere in the
$PATH.

I have a git-ss command in my path which prevents the 'ss' alias from
being used.  This command will always fail for git.git, causing the test
to fail.  Even if the command succeeded, that would be a false success
for the test since the alias wasn't actually used.  A longer, more
descriptive name will make it much less likely that somebody has a
command in their $PATH which will shadow the alias created for the test.

While here, use a longer name for the 'test' alias as well since that is
also short and meaningful enough to make it not unlikely that somebody
would have a command in their $PATH which will shadow that as well.

Signed-off-by: Aaron Schrab <aaron@schrab.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Aaron Schrab 2012-12-28 18:03:06 -05:00 committed by Junio C Hamano
parent 15999998fb
commit d16ece2011
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
' '