From: Alex Riesen Date: Fri, 05 Dec 2008 00:39:14 GMT Subject: [PATCH 3/3] Report symlink failures in merge-recursive Message-ID: <20081205003914.GC7294@blimp.localdomain> In-Reply-To: <20081205003546.GA7294@blimp.localdomain> Signed-off-by: Alex Riesen --- I don't check for unlink success in the line above, because symlink will fail if unlink failed to cleanup the new path. merge-recursive.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 0e988f2..a0c804c 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'", -- 1.6.1.rc1.29.gb140