summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--merge-recursive.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index dbdb9ac2c4..ac90fd9e27 100644
--- 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,