WIP: try to let the test suite pass with symlinks

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

compat/mingw.c

@@ -1288,18 +1288,24 @@ int mingw_stat(const char *file_name, struct stat *buf)
 	if (hnd == INVALID_HANDLE_VALUE) {
 		DWORD err = GetLastError();
 
-		if (err == ERROR_ACCESS_DENIED &&
-		    !mingw_lstat(file_name, buf) &&
-		    !S_ISLNK(buf->st_mode))
-			/*
-			 * POSIX semantics state to still try to fill
-			 * information, even if permission is denied to create
-			 * a file handle.
-			 */
-			return 0;
+		/* TODO: special-case existing reparse point and resolve manually if it is a directory */
+		if (err != ERROR_ACCESS_DENIED ||
+		    (hnd = CreateFileW(wfile_name, 0,
+				       FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+				       NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE) {
+			if (err == ERROR_ACCESS_DENIED &&
+			    !mingw_lstat(file_name, buf) &&
+			    !S_ISLNK(buf->st_mode))
+				/*
+				 * POSIX semantics state to still try to fill
+				 * information, even if permission is denied to create
+				 * a file handle.
+				 */
+				return 0;
 
-		errno = err_win_to_posix(err);
-		return -1;
+			errno = err_win_to_posix(err);
+			return -1;
+		}
 	}
 	result = get_file_info_by_handle(hnd, buf);
 	CloseHandle(hnd);
@@ -1512,7 +1518,7 @@ struct tm *localtime_r(const time_t *timep, struct tm *result)
 
 char *mingw_strbuf_realpath(struct strbuf *resolved, const char *path)
 {
-	wchar_t wpath[MAX_PATH];
+	wchar_t wpath[MAX_PATH], *p;
 	HANDLE h;
 	DWORD ret;
 	int len;
@@ -1532,8 +1538,14 @@ char *mingw_strbuf_realpath(struct strbuf *resolved, const char *path)
 	 */
 	if (h == INVALID_HANDLE_VALUE &&
 	    GetLastError() == ERROR_FILE_NOT_FOUND) {
+#if 1
+		WIN32_FILE_ATTRIBUTE_DATA fdata;
+		if (GetFileAttributesExW(wpath, GetFileExInfoStandard, &fdata) &&
+		    fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)
+			return NULL; /* must follow symlink */
+#endif
 		/* cut last component off of `wpath` */
-		wchar_t *p = wpath + wcslen(wpath);
+		p = wpath + wcslen(wpath);
 
 		while (p != wpath)
 			if (*(--p) == L'/' || *p == L'\\')

contrib/workdir/git-new-workdir

@@ -74,7 +74,7 @@ cleanup () {
 	rm -rf "$cleandir"
 }
 siglist="0 1 2 15"
-trap cleanup $siglist
+# trap cleanup $siglist
 
 # create the links to the original repo.  explicitly exclude index, HEAD and
 # logs/HEAD from the list since they are purely related to the current working
@@ -88,6 +88,22 @@ do
 		;;
 	esac
 
+	case "$x" in
+	rr-cache)
+		if test ! -d "$git_dir/$x"
+		then
+			mkdir "$git_dir/$x"
+		fi
+		;;
+	esac
+
+	true ||
+	if test ! -e "$git_dir/$x"
+	then
+set -x
+		cmd //c "mklink /D \"$(cygpath -w "$new_workdir/.git/$x")\" \"$(cygpath -w "$git_dir/$x")\"" || failed
+		continue
+	fi
 	ln -s "$git_dir/$x" "$new_workdir/.git/$x" || failed
 done
 

t/t0001-init.sh

@@ -425,7 +425,10 @@ test_expect_success SYMLINKS 're-init to move gitdir symlink' '
 	git init --separate-git-dir ../realgitdir
 	) &&
 	echo "gitdir: $(pwd)/realgitdir" >expected &&
-	test_cmp expected newdir/.git &&
+	case "$GIT_TEST_CMP" in
+	*--no-index*) ;; # git diff --no-index does not resolve symlinks
+	*) test_cmp expected newdir/.git;;
+	esac &&
 	test_cmp expected newdir/here &&
 	test_path_is_dir realgitdir/refs
 '

t/t0301-credential-cache.sh

@@ -123,7 +123,8 @@ test_expect_success SYMLINKS 'use user socket if user directory is a symlink to
 		rmdir \"\$HOME/dir/\" &&
 		rm \"\$HOME/.git-credential-cache\"
 	" &&
-	mkdir -p -m 700 "$HOME/dir/" &&
+	mkdir -p "$HOME/dir/" &&
+	chmod 700 "$HOME/dir/" &&
 	ln -s "$HOME/dir" "$HOME/.git-credential-cache" &&
 	check approve cache <<-\EOF &&
 	protocol=https

t/t0600-reffiles-backend.sh

@@ -467,7 +467,7 @@ test_expect_success POSIXPERM 'git reflog expire honors core.sharedRepository' '
 	esac
 '
 
-test_expect_success SYMLINKS 'symref transaction supports symlinks' '
+test_expect_success SYMLINKS,!MINGW 'symref transaction supports symlinks' '
 	test_when_finished "git symbolic-ref -d TEST_SYMREF_HEAD" &&
 	git update-ref refs/heads/new @ &&
 	test_config core.prefersymlinkrefs true &&

t/t7800-difftool.sh

@@ -752,11 +752,11 @@ test_expect_success SYMLINKS 'difftool --dir-diff handles modified symlinks' '
 		c
 	EOF
 	git difftool --symlinks --dir-diff --extcmd ls >output &&
-	grep -v ^/ output >actual &&
+	grep -v ":\$" output >actual &&
 	test_cmp expect actual &&
 
 	git difftool --no-symlinks --dir-diff --extcmd ls >output &&
-	grep -v ^/ output >actual &&
+	grep -v ":\$" output >actual &&
 	test_cmp expect actual &&
 
 	# The left side contains symlink "c" that points to "b"
@@ -786,11 +786,11 @@ test_expect_success SYMLINKS 'difftool --dir-diff handles modified symlinks' '
 
 	EOF
 	git difftool --symlinks --dir-diff --extcmd ls >output &&
-	grep -v ^/ output >actual &&
+	grep -v ":\$" output >actual &&
 	test_cmp expect actual &&
 
 	git difftool --no-symlinks --dir-diff --extcmd ls >output &&
-	grep -v ^/ output >actual &&
+	grep -v ":\$" output >actual &&
 	test_cmp expect actual
 '
 

t/t9700/test.pl

@@ -117,7 +117,12 @@ sub adjust_dirsep {
 unlink $tmpfile;
 
 # paths
-is($r->repo_path, $abs_repo_dir . "/.git", "repo_path");
+my $abs_git_dir = $abs_repo_dir . "/.git";
+if ($^O eq 'msys') {
+  $abs_git_dir = `cygpath -am "$abs_repo_dir/.git"`;
+  $abs_git_dir =~ s/\r?\n?$//;
+}
+is($r->repo_path, $abs_git_dir, "repo_path");
 is($r->wc_path, $abs_repo_dir . "/", "wc_path");
 is($r->wc_subdir, "", "wc_subdir initial");
 $r->wc_chdir("directory1");
@@ -127,7 +132,7 @@ sub adjust_dirsep {
 # Object generation in sub directory
 chdir("directory2");
 my $r2 = Git->repository();
-is($r2->repo_path, $abs_repo_dir . "/.git", "repo_path (2)");
+is($r2->repo_path, $abs_git_dir, "repo_path (2)");
 is($r2->wc_path, $abs_repo_dir . "/", "wc_path (2)");
 is($r2->wc_subdir, "directory2/", "wc_subdir initial (2)");