From: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon, 14 Oct 2013 18:09:30 +0000 (-0700)
Subject: Merge branch 'sb/checkout-test-complex-path'
X-Git-Tag: v1.8.5-rc0~60
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/774282d16ab5aa2ec4b8bb7fa4ad83b0622ee778?hp=0e3b378c3ad3d8c5b02c0ab4828ddb9da1a96e57

Merge branch 'sb/checkout-test-complex-path'

* sb/checkout-test-complex-path:
checkout test: enable test with complex relative path
---

diff --git a/t/t2008-checkout-subdir.sh b/t/t2008-checkout-subdir.sh
index 3e098ab31e..eadb9434ae 100755
--- a/t/t2008-checkout-subdir.sh
+++ b/t/t2008-checkout-subdir.sh
@@ -58,13 +58,13 @@ test_expect_success 'checkout with simple prefix' '
 
 '
 
-# This is not expected to work as ls-files was not designed
-# to deal with such.  Enable it when ls-files is updated.
-: test_expect_success 'checkout with complex relative path' '
-
-	rm file1 &&
-	git checkout HEAD -- ../dir1/../dir1/file1 && test -f ./file1
-
+test_expect_success 'checkout with complex relative path' '
+	(
+		cd dir1 &&
+		rm file1 &&
+		git checkout HEAD -- ../dir1/../dir1/file1 &&
+		test "hello" = "$(cat file1)"
+	)
 '
 
 test_expect_success 'relative path outside tree should fail' \