aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-08 22:32:59 -0700
committerJunio C Hamano <gitster@pobox.com>2010-05-08 22:32:59 -0700
commit3ecaa3b6a5f707617ea610d727c696f43f8b2f0b (patch)
tree092dc9814e12b70ae637c26e36e5d0e6813657b4 /merge-recursive.c
parent43acff34b902c38808ac0f326090f2516250e1f0 (diff)
parent25755e842f814751fbdb7abfc8255a40f24bfaa3 (diff)
downloadgit-3ecaa3b6a5f707617ea610d727c696f43f8b2f0b.tar.gz
git-3ecaa3b6a5f707617ea610d727c696f43f8b2f0b.tar.xz
Merge branch 'pc/remove-warn'
* pc/remove-warn: Remove a redundant errno test in a usage of remove_path Introduce remove_or_warn function Implement the rmdir_or_warn function Generalise the unlink_or_warn function
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 917397ca7..206c10363 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -409,7 +409,7 @@ static int remove_file(struct merge_options *o, int clean,
return -1;
}
if (update_working_directory) {
- if (remove_path(path) && errno != ENOENT)
+ if (remove_path(path))
return -1;
}
return 0;