Skip to content

Commit d16ece2

Browse files
aschrabgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 1599999 commit d16ece2

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

t/t1020-subdirectory.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,29 +111,29 @@ test_expect_success 'read-tree' '
111111

112112
test_expect_success 'alias expansion' '
113113
(
114-
git config alias.ss status &&
114+
git config alias.test-status-alias status &&
115115
cd dir &&
116116
git status &&
117-
git ss
117+
git test-status-alias
118118
)
119119
'
120120

121121
test_expect_success NOT_MINGW '!alias expansion' '
122122
pwd >expect &&
123123
(
124-
git config alias.test !pwd &&
124+
git config alias.test-alias-directory !pwd &&
125125
cd dir &&
126-
git test >../actual
126+
git test-alias-directory >../actual
127127
) &&
128128
test_cmp expect actual
129129
'
130130

131131
test_expect_success 'GIT_PREFIX for !alias' '
132132
printf "dir/" >expect &&
133133
(
134-
git config alias.test "!sh -c \"printf \$GIT_PREFIX\"" &&
134+
git config alias.test-alias-directory "!sh -c \"printf \$GIT_PREFIX\"" &&
135135
cd dir &&
136-
git test >../actual
136+
git test-alias-directory >../actual
137137
) &&
138138
test_cmp expect actual
139139
'

0 commit comments

Comments
 (0)