diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2010-03-26 15:25:35 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-28 09:53:05 -0700 |
| commit | 25755e842f814751fbdb7abfc8255a40f24bfaa3 (patch) | |
| tree | 0af514ba3fc7186a468aa7366250710b09b3cd2b /merge-recursive.c | |
| parent | 80d706afed6c6c6fb3ac9c168a6a958244405b45 (diff) | |
| download | git-25755e842f814751fbdb7abfc8255a40f24bfaa3.tar.gz git-25755e842f814751fbdb7abfc8255a40f24bfaa3.tar.xz | |
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>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |