From 25755e842f814751fbdb7abfc8255a40f24bfaa3 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Fri, 26 Mar 2010 15:25:35 +0000 Subject: Remove a redundant errno test in a usage of remove_path The errno test is redundant because the same test is carried out in remove_path itself. Signed-off-by: Peter Collingbourne Signed-off-by: Junio C Hamano --- merge-recursive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge-recursive.c b/merge-recursive.c index 195ebf974..87232b899 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; -- cgit v1.2.1