diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-12 00:47:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-12 00:47:34 (GMT) |
| commit | b88cb8815879beefce4cfd83261adea728752c25 (patch) | |
| tree | 349790d3486113b6428e4ea339e2d1317cb805c8 | |
| parent | e6f1550aa569fa5773977bc2c83729f29031b39e (diff) | |
| parent | d16ece20112c9418916bca87bbed0ff68b2169e9 (diff) | |
| download | git-b88cb8815879beefce4cfd83261adea728752c25.zip git-b88cb8815879beefce4cfd83261adea728752c25.tar.gz git-b88cb8815879beefce4cfd83261adea728752c25.tar.bz2 | |
Merge branch 'as/test-name-alias-uniquely' into maint
* 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 e23ac0e..1e2945e 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 ' |