[PATCH 07/12] Remove a redundant errno test in a usage of remove_path
From: Peter Collingbourne <hidden>
Date: 2016-06-15 22:48:30
Subsystem:
the rest · Maintainer:
Linus Torvalds
The errno test is redundant because the same test is carried out in remove_path itself. Signed-off-by: Peter Collingbourne <redacted> --- merge-recursive.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 195ebf9..87232b8 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;
--
1.6.5