diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-08 13:23:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-08 13:23:22 -0800 |
| commit | 8d1b1a02493072aeb11fa8d6d27759a917e7aad5 (patch) | |
| tree | 7741940cd2c8425ecac85865711016ce28a3cba2 | |
| parent | Merge branch 'ta/remove-stale-translated-tut' (diff) | |
| parent | Use longer alias names in subdirectory tests (diff) | |
| download | tgif-8d1b1a02493072aeb11fa8d6d27759a917e7aad5.tar.xz | |
Merge branch 'as/test-name-alias-uniquely'
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
| -rwxr-xr-x | t/t1020-subdirectory.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh index e23ac0e69d..1e2945ec7e 100755 --- a/t/t1020-subdirectory.sh +++ b/t/t1020-subdirectory.sh @@ -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 ' |