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 <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/builtin-blame.c b/builtin-blame.c
index 682edba9e570a1f65298b28681f39aa575e14ee7..3442d282aab208720ba11cebce30b89c55238ddd 100644 (file)
--- 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 b57a88a6b0da36562bc2ce9d0d9e11b12ad990c3..8d3f742d432c966e5afe03e8d0628eb92a73920c 100644 (file)
--- 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))