X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=entry.c;h=d72f811580ad10e792e38b40fe79bf4af3868846;hb=957d6ea78fcbe71481a6f46a58768e100f7908e0;hp=21b5f2e26d77a2e7b10a6336d9e14db72b1f7e45;hpb=4808bec6f9b5fe414f0dbc2cc0445f54f28e9e9c;p=git.git

diff --git a/entry.c b/entry.c
index 21b5f2e26..d72f81158 100644
--- a/entry.c
+++ b/entry.c
@@ -111,9 +111,12 @@ static int write_entry(struct cache_entry *ce, char *path, struct checkout *stat
 			return error("git-checkout-index: unable to write file %s", path);
 		break;
 	case S_IFLNK:
-		if (to_tempfile) {
-			strcpy(path, ".merge_link_XXXXXX");
-			fd = mkstemp(path);
+		if (to_tempfile || !has_symlinks) {
+			if (to_tempfile) {
+				strcpy(path, ".merge_link_XXXXXX");
+				fd = mkstemp(path);
+			} else
+				fd = create_file(path, 0666);
 			if (fd < 0) {
 				free(new);
 				return error("git-checkout-index: unable to create "