From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Tue, 18 Jul 2006 17:46:34 +0000 (+0200)
Subject: Fix t4114 on cygwin
X-Git-Tag: v1.4.2-rc2~6^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=56ac168f6f89bebf2846c4bafed01318fe3f25cd;p=git.git

Fix t4114 on cygwin

On cygwin, when you try to create a symlink over a directory, you do
not get EEXIST, but EACCES.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-apply.c b/builtin-apply.c
index 8f7cf44c6..d924ac3d0 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -2034,7 +2034,7 @@ static void create_one_file(char *path, unsigned mode, const char *buf, unsigned
 			return;
 	}
 
-	if (errno == EEXIST) {
+	if (errno == EEXIST || errno == EACCES) {
 		/* We may be trying to create a file where a directory
 		 * used to be.
 		 */