summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-30 09:23:33 +0900
committerJunio C Hamano <gitster@pobox.com>2017-05-30 09:29:00 +0900
commitc7054209d65db430bdbcb2243288e63cea3e417c (patch)
tree215774833cded6430026ed7c88a646143223c28e /apply.c
parentdc5a18b3643553cacd6f1a3e4bff6a678b067055 (diff)
downloadgit-c7054209d65db430bdbcb2243288e63cea3e417c.tar.gz
treewide: use is_missing_file_error() where ENOENT and ENOTDIR are checkedjc/noent-notdir
Using the is_missing_file_error() helper introduced in the previous step, update all hits from $ git grep -e ENOENT --and -e ENOTDIR There are codepaths that only check ENOENT, and it is possible that some of them should be checking both. Updating them is kept out of this step deliberately, as we do not want to change behaviour in this step. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'apply.c')
-rw-r--r--apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apply.c b/apply.c
index 0e2caeab9c..59bb3497de 100644
--- a/apply.c
+++ b/apply.c
@@ -3741,7 +3741,7 @@ static int check_to_create(struct apply_state *state,
return 0;
return EXISTS_IN_WORKTREE;
- } else if ((errno != ENOENT) && (errno != ENOTDIR)) {
+ } else if (!is_missing_file_error(errno)) {
return error_errno("%s", new_name);
}
return 0;