From: Peter Collingbourne Date: Fri, 26 Mar 2010 15:25:35 GMT Subject: [PATCH 07/12] Remove a redundant errno test in a usage of remove_path Message-ID: <1269617140-7827-8-git-send-email-peter@pcc.me.uk> In-Reply-To: <1269617140-7827-1-git-send-email-peter@pcc.me.uk> The errno test is redundant because the same test is carried out in remove_path itself. Signed-off-by: Peter Collingbourne --- 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