From: Alex Riesen <raa.lkml@gmail.com>
Date: Fri, 5 Dec 2008 00:39:14 +0000 (+0100)
Subject: Report symlink failures in merge-recursive
X-Git-Tag: v1.6.1-rc2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=304dcf262e3f8524c909a13cf73a67522be6353b;p=git.git

Report symlink failures in merge-recursive

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/merge-recursive.c b/merge-recursive.c
index 0e988f2a0..a0c804c81 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -525,7 +525,8 @@ static void update_file_flags(struct merge_options *o,
 			char *lnk = xmemdupz(buf, size);
 			safe_create_leading_directories_const(path);
 			unlink(path);
-			symlink(lnk, path);
+			if (symlink(lnk, path))
+				die("failed to symlink %s: %s", path, strerror(errno));
 			free(lnk);
 		} else
 			die("do not know what to do with %06o %s '%s'",