summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-09-26 08:31:56 -0700
committerShawn O. Pearce <spearce@spearce.org>2008-09-26 08:31:56 -0700
commit15dc66abf02fa22a03d709725bcaeeec4b809834 (patch)
treeec812826aea20a20624ad6de5933941582634652 /merge-recursive.c
parenteb53586ba94087d9750c58d29ff494e5c1a95207 (diff)
parent41f13af558db1018250ade4d99a51f0b76f65bc8 (diff)
downloadgit-15dc66abf02fa22a03d709725bcaeeec4b809834.tar.gz
Merge branch 'maint'
* maint: Remove empty directories in recursive merge Documentation: clarify the details of overriding LESS via core.pager Conflicts: builtin-merge-recursive.c
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index ac90fd9e27..08917314fb 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -419,10 +419,8 @@ static int remove_file(struct merge_options *o, int clean,
return -1;
}
if (update_working_directory) {
- unlink(path);
- if (errno != ENOENT || errno != EISDIR)
+ if (remove_path(path) && errno != ENOENT)
return -1;
- remove_path(path);
}
return 0;
}