sha1_file.c: don't ignore an error condition in sha1_loose_object_info()

diff --git a/merge-recursive.c b/merge-recursive.c
index 58989424d77467da018e7daf5761f1f85040d2f6..397a7ad85b4968b9376438f12d0c3c70b7aed880 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -589,7 +589,7 @@ static void update_file_flags(const unsigned char *sha,
                        memcpy(lnk, buf, size);
                        lnk[size] = '\0';
                        mkdir_p(path, 0777);
-                       unlink(lnk);
+                       unlink(path);
                        symlink(lnk, path);
                } else
                        die("do not know what to do with %06o %s '%s'",