Use longer alias names in subdirectory tests

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>

Aaron Schrab committed Dec 28, 2012 at 18:03 UTC d16ece20112c9418916bca87bbed0ff68b2169e9
1 file changed +6 -6
t/t1020-subdirectory.sh
+6 -6
@@ -111,19 +111,19 @@ test_expect_success 'read-tree' '
111
112 test_expect_success 'alias expansion' '
113 (
114 - git config alias.ss status &&
114 + git config alias.test-status-alias status &&
115 cd dir &&
116 git status &&
117 - git ss
117 + git test-status-alias
118 )
119 '
120
121 test_expect_success NOT_MINGW '!alias expansion' '
122 pwd >expect &&
123 (
124 - git config alias.test !pwd &&
124 + git config alias.test-alias-directory !pwd &&
125 cd dir &&
126 - git test >../actual
126 + git test-alias-directory >../actual
127 ) &&
128 test_cmp expect actual
129 '
@@ -131,9 +131,9 @@ test_expect_success NOT_MINGW '!alias expansion' '
131 test_expect_success 'GIT_PREFIX for !alias' '
132 printf "dir/" >expect &&
133 (
134 - git config alias.test "!sh -c \"printf \$GIT_PREFIX\"" &&
134 + git config alias.test-alias-directory "!sh -c \"printf \$GIT_PREFIX\"" &&
135 cd dir &&
136 - git test >../actual
136 + git test-alias-directory >../actual
137 ) &&
138 test_cmp expect actual
139 '