Merge branch 'lw/test-fix'

gitster · gitster · commit f0d2a057c1f8 · 2008-06-01T23:45:37.000-07:00
* lw/test-fix:
  t/test-lib.sh: resolve symlinks in working directory, for pathname comparisons
diff --git a/t/test-lib.sh b/t/test-lib.sh
@@ -419,7 +419,9 @@ rm -fr "$test" || {
 }
 
 test_create_repo "$test"
-cd "$test" || exit 1
+# Use -P to resolve symlinks in our working directory so that the cwd
+# in subprocesses like git equals our $PWD (for pathname comparisons).
+cd -P "$test" || exit 1
 
 this_test=$(expr "./$0" : '.*/\(t[0-9]*\)-[^/]*$')
 for skp in $GIT_SKIP_TESTS

Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,9 @@ rm -fr "$test" \|\| {`
`419`	`419`	`}`
`420`	`420`
`421`	`421`	`test_create_repo "$test"`
`422`		`-cd "$test" \|\| exit 1`
	`422`	`+# Use -P to resolve symlinks in our working directory so that the cwd`
	`423`	`+# in subprocesses like git equals our $PWD (for pathname comparisons).`
	`424`	`+cd -P "$test" \|\| exit 1`
`423`	`425`
`424`	`426`	`this_test=$(expr "./$0" : './\(t[0-9]\)-[^/]*$')`
`425`	`427`	`for skp in $GIT_SKIP_TESTS`