Merge branch 'as/test-name-alias-uniquely' into maint

gitster · gitster · commit b88cb8815879 · 2013-01-11T16:47:34.000-08:00
* as/test-name-alias-uniquely:
  Use longer alias names in subdirectory tests
diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh
@@ -111,29 +111,29 @@ 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
 '
 
 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
 '

Original file line number	Diff line number	Diff line change
`@@ -111,29 +111,29 @@ test_expect_success 'read-tree' '`
`111`	`111`
`112`	`112`	`test_expect_success 'alias expansion' '`
`113`	`113`	`(`
`114`		`- git config alias.ss status &&`
	`114`	`+ git config alias.test-status-alias status &&`
`115`	`115`	`cd dir &&`
`116`	`116`	`git status &&`
`117`		`- git ss`
	`117`	`+ git test-status-alias`
`118`	`118`	`)`
`119`	`119`	`'`
`120`	`120`
`121`	`121`	`test_expect_success NOT_MINGW '!alias expansion' '`
`122`	`122`	`pwd >expect &&`
`123`	`123`	`(`
`124`		`- git config alias.test !pwd &&`
	`124`	`+ git config alias.test-alias-directory !pwd &&`
`125`	`125`	`cd dir &&`
`126`		`- git test >../actual`
	`126`	`+ git test-alias-directory >../actual`
`127`	`127`	`) &&`
`128`	`128`	`test_cmp expect actual`
`129`	`129`	`'`
`130`	`130`
`131`	`131`	`test_expect_success 'GIT_PREFIX for !alias' '`
`132`	`132`	`printf "dir/" >expect &&`
`133`	`133`	`(`
`134`		`- git config alias.test "!sh -c \"printf \$GIT_PREFIX\"" &&`
	`134`	`+ git config alias.test-alias-directory "!sh -c \"printf \$GIT_PREFIX\"" &&`
`135`	`135`	`cd dir &&`
`136`		`- git test >../actual`
	`136`	`+ git test-alias-directory >../actual`
`137`	`137`	`) &&`
`138`	`138`	`test_cmp expect actual`
`139`	`139`	`'`