diff options
| author | Alex Riesen <raa.lkml@gmail.com> | 2008-12-05 01:39:14 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-04 18:05:51 -0800 |
| commit | 304dcf262e3f8524c909a13cf73a67522be6353b (patch) | |
| tree | 3e7c598fbe8eab872c38a55fa9f4469a7a44fa82 /merge-recursive.c | |
| parent | 7be77de266b5cbcbd28d69a04df6f0b167b87cf6 (diff) | |
| download | git-304dcf262e3f8524c909a13cf73a67522be6353b.tar.gz git-304dcf262e3f8524c909a13cf73a67522be6353b.tar.xz | |
Report symlink failures in merge-recursive
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 3 |
1 files changed, 2 insertions, 1 deletions
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'", |