From: Alex Riesen Date: Mon, 30 Apr 2007 22:27:05 +0000 (+0200) Subject: Remove pointless calls to access(2) when checking for .mailmap X-Git-Tag: v1.5.2-rc1~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e44b5d106c2934b93cfba2ea7fb2ed1e32edaae2;p=thirdparty%2Fgit.git Remove pointless calls to access(2) when checking for .mailmap read_mailmap already returns not 0 in case of error, and nothing seem to be interested in it. It also is silent about the fact (read_mailmap being to chatty would justify the call to access, but there is no point for it to be and it isn't). Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano --- diff --git a/builtin-blame.c b/builtin-blame.c index 682edba9e5..3442d282aa 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -2375,7 +2375,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix) die("reading graft file %s failed: %s", revs_file, strerror(errno)); - if (!no_mailmap && !access(".mailmap", R_OK)) + if (!no_mailmap) read_mailmap(&mailmap, ".mailmap", NULL); assign_blame(&sb, &revs, opt); diff --git a/builtin-shortlog.c b/builtin-shortlog.c index b57a88a6b0..8d3f742d43 100644 --- a/builtin-shortlog.c +++ b/builtin-shortlog.c @@ -283,8 +283,7 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix) if (argc > 1) die ("unrecognized argument: %s", argv[1]); - if (!access(".mailmap", R_OK)) - read_mailmap(&mailmap, ".mailmap", &common_repo_prefix); + read_mailmap(&mailmap, ".mailmap", &common_repo_prefix); if (rev.pending.nr == 0) { if (isatty(0))