Merge pull request #70 from jamill/jamill/virtual_filesystem_directories

virtualfilesystem: fix case where directories not handled correctly
microsoft · Dec 15, 2018 · 6d0ebfe · 6d0ebfe
2 parents 55a39a1 + a7cfd2a
commit 6d0ebfe
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/t/t1092-virtualfilesystem.sh b/t/t1092-virtualfilesystem.sh
@@ -348,4 +348,23 @@ test_expect_success 'on folder renamed' '
 	test_cmp expected actual
 '
 
+test_expect_success 'folder with same prefix as file' '
+	clean_repo &&
+	touch dir1.sln &&
+	write_script .git/hooks/virtualfilesystem <<-\EOF &&
+		printf "dir1/\0"
+		printf "dir1.sln\0"
+	EOF
+	git add dir1.sln &&
+	git ls-files -v > actual &&
+	cat > expected <<-\EOF &&
+		H dir1.sln
+		H dir1/file1.txt
+		H dir1/file2.txt
+		S dir2/file1.txt
+		S dir2/file2.txt
+	EOF
+	test_cmp expected actual
+'
+
 test_done
diff --git a/virtualfilesystem.c b/virtualfilesystem.c
@@ -273,7 +273,7 @@ void apply_virtualfilesystem(struct index_state *istate)
 			if (buf[i - 1] == '/') {
 				if (ignore_case)
 					adjust_dirname_case(istate, entry);
-				pos = index_name_pos(istate, entry, len - 1);
+				pos = index_name_pos(istate, entry, len);
 				if (pos < 0) {
 					pos = -pos - 1;
 					while (pos < istate->cache_nr && !fspathncmp(istate->cache[pos]->name, entry, len)) {