Cleanup remove_path

Signed-off-by: Alex Riesen <redacted>
Signed-off-by: Shawn O. Pearce <redacted>

diff --git a/merge-recursive.c b/merge-recursive.c
index dbdb9ac2c41d700f7d8521f25a5d45aefd0829c7..ac90fd9e2719a0084e45c195a446ee0571acb8e3 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -394,12 +394,10 @@ static int update_stages(const char *path, struct diff_filespec *o,
 
 static int remove_path(const char *name)
 {
-       int ret;
        char *slash, *dirs;
 
-       ret = unlink(name);
-       if (ret)
-               return ret;
+       if (unlink(name))
+               return -1;
        dirs = xstrdup(name);
        while ((slash = strrchr(name, '/'))) {
                *slash = '\0';
@@ -407,7 +405,7 @@ static int remove_path(const char *name)
                        break;
        }
        free(dirs);
-       return ret;
+       return 0;
 }
 
 static int remove_file(struct merge_options *o, int clean,