From 304dcf262e3f8524c909a13cf73a67522be6353b Mon Sep 17 00:00:00 2001 From: Alex Riesen Date: Fri, 5 Dec 2008 01:39:14 +0100 Subject: [PATCH] Report symlink failures in merge-recursive Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano --- merge-recursive.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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'", -- 2.26.2