diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-09 07:32:59 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-09 07:32:59 +0200 |
| commit | 3ecaa3b6a5f707617ea610d727c696f43f8b2f0b (patch) | |
| tree | 092dc9814e12b70ae637c26e36e5d0e6813657b4 /merge-recursive.c | |
| parent | cherry-pick: do not dump core when iconv fails (diff) | |
| parent | Remove a redundant errno test in a usage of remove_path (diff) | |
| download | git-3ecaa3b6a5f707617ea610d727c696f43f8b2f0b.tar.xz git-3ecaa3b6a5f707617ea610d727c696f43f8b2f0b.zip | |
Merge branch 'pc/remove-warn'
* pc/remove-warn:
Remove a redundant errno test in a usage of remove_path
Introduce remove_or_warn function
Implement the rmdir_or_warn function
Generalise the unlink_or_warn function
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 917397ca7a..206c103635 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; |