fixup! Win32: symlink: specify symlink type in .gitattributes

Since `git_check_attr()` implicitly depends on the index, we really
should redo this in a manner that has a chance of going into upstream:
by introducing an index-aware helper function to create symbolic links,
and to override that in a Windows-specific manner instead.

In preparation for this, let's drop the original commit for now.

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

Author: dscho

Documentation/gitattributes.txt

@@ -382,36 +382,6 @@ sign `$` upon checkout.  Any byte sequence that begins with
 with `$Id$` upon check-in.
 
 
-`symlink`
-^^^^^^^^^
-
-On Windows, symbolic links have a type: a "file symlink" must point at
-a file, and a "directory symlink" must point at a directory. If the
-type of symlink does not match its target, it doesn't work.
-
-Git does not record the type of symlink in the index or in a tree. On
-checkout it'll guess the type, which only works if the target exists
-at the time the symlink is created. This may often not be the case,
-for example when the link points at a directory inside a submodule.
-
-The `symlink` attribute allows you to explicitly set the type of symlink
-to `file` or `dir`, so Git doesn't have to guess. If you have a set of
-symlinks that point at other files, you can do:
-
-------------------------
-*.gif 	symlink=file
-------------------------
-
-To tell Git that a symlink points at a directory, use:
-
-------------------------
-tools_folder 	symlink=dir
-------------------------
-
-The `symlink` attribute is ignored on platforms other than Windows,
-since they don't distinguish between different types of symlinks.
-
-
 `filter`
 ^^^^^^^^
 

compat/mingw.c

@@ -9,7 +9,6 @@
 #include "win32/lazyload.h"
 #include "../config.h"
 #include "dir.h"
-#include "../attr.h"
 
 #define HCAST(type, handle) ((type)(intptr_t)handle)
 
@@ -2382,33 +2381,6 @@ int link(const char *oldpath, const char *newpath)
 	return 0;
 }
 
-enum symlink_type {
-	SYMLINK_TYPE_UNSPECIFIED = 0,
-	SYMLINK_TYPE_FILE,
-	SYMLINK_TYPE_DIRECTORY,
-};
-
-static enum symlink_type check_symlink_attr(const char *link)
-{
-	static struct attr_check *check;
-	const char *value;
-
-	if (!check)
-		check = attr_check_initl("symlink", NULL);
-
-	git_check_attr(the_repository->index, link, check);
-
-	value = check->items[0].value;
-	if (value == NULL)
-		;
-	else if (!strcmp(value, "file"))
-		return SYMLINK_TYPE_FILE;
-	else if (!strcmp(value, "dir"))
-		return SYMLINK_TYPE_DIRECTORY;
-
-	return SYMLINK_TYPE_UNSPECIFIED;
-}
-
 int symlink(const char *target, const char *link)
 {
 	wchar_t wtarget[MAX_LONG_PATH], wlink[MAX_LONG_PATH];
@@ -2429,31 +2401,7 @@ int symlink(const char *target, const char *link)
 		if (wtarget[len] == '/')
 			wtarget[len] = '\\';
 
-	switch (check_symlink_attr(link)) {
-	case SYMLINK_TYPE_UNSPECIFIED:
-		/* Create a phantom symlink: it is initially created as a file
-		 * symlink, but may change to a directory symlink later if/when
-		 * the target exists. */
-		return create_phantom_symlink(wtarget, wlink);
-	case SYMLINK_TYPE_FILE:
-		if (!CreateSymbolicLinkW(wlink, wtarget, symlink_file_flags))
-			break;
-		return 0;
-	case SYMLINK_TYPE_DIRECTORY:
-		if (!CreateSymbolicLinkW(wlink, wtarget,
-					 symlink_directory_flags))
-			break;
-		/* There may be dangling phantom symlinks that point at this
-		 * one, which should now morph into directory symlinks. */
-		process_phantom_symlinks();
-		return 0;
-	default:
-		BUG("unhandled symlink type");
-	}
-
-	/* CreateSymbolicLinkW failed. */
-	errno = err_win_to_posix(GetLastError());
-	return -1;
+	return create_phantom_symlink(wtarget, wlink);
 }
 
 #ifndef _WINNT_H