[PATCH] Add test cases for handling of name conflicts between files and directories.

@@ -36,6 +36,9 @@ test_expect_success setup '
 	git update-index --add --remove one two three &&
 	git commit -m "Side M one, D two, A three" &&
 
+	git branch with-file master &&
+	git branch with-dir master &&
+
 	git checkout master
 '
 

@@ -129,4 +132,71 @@ test_expect_success 'checkout -m with merge conflict' '
 	! test -s current
 '
 
+test_expect_success 'checkout with file/directory conflict' '
+
+	git checkout -f with-dir && git clean &&
+
+	mv one one- &&
+	mkdir one &&
+	mv one- one/file &&
+	git add one/file &&
+	git commit -m "with-dir D one A one/file" &&
+	
+	git checkout with-file &&
+	git checkout with-dir
+'
+
+test_expect_success 'checkout with file/directory conflict and modified file in dir' '
+
+	git checkout -f with-dir && git-clean &&
+
+	fill 1 2 3 4 5 6 7 > one/file &&
+	if git checkout with-file
+	then
+		echo Should have detected modified file in subdirectory
+		false
+	else
+		echo "happy - failed correctly"
+	fi
+'
+
+test_expect_success 'checkout with file/directory conflict and untracked file in dir' '
+
+	git checkout -f with-dir && git-clean &&
+
+	fill 1 2 3 > one/file2 &&
+	if git checkout with-file
+	then
+		echo Should have detected untracked file in subdirectory
+		false
+	else
+		echo "happy - failed correctly"
+	fi &&
+	rm one/file2
+'
+
+test_expect_success 'checkout with file/directory conflict and deleted file in dir' '
+
+	git checkout -f with-dir && git-clean &&
+
+	rm one/file &&
+	git checkout with-file
+'
+
+test_expect_success 'checkout with file/directory conflict and modified file' '
+
+	git checkout -f with-file && git-clean &&
+
+	fill 1 2 3 > one &&
+	if git checkout with-dir
+	then
+		echo Should have detected modified file
+		false
+	else
+		echo "happy - failed correctly"
+	fi &&
+
+	git reset --hard
+'
+
 test_done