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 <peter@pcc.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Peter Collingbourne committed
Mar 26, 2010 at 15:25 UTC
25755e842f814751fbdb7abfc8255a40f24bfaa3
1 file changed
+1
-1
merge-recursive.c
+1
-1
@@ -409,7 +409,7 @@ static int remove_file(struct merge_options *o, int clean,
409
return -1;
410
}
411
if (update_working_directory) {
412
- if (remove_path(path) && errno != ENOENT)
412
+ if (remove_path(path))
413
return -1;
414
}
415
return 0;