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@xxxxxxxxx>
---
builtin-blame.c | 2 +-
builtin-shortlog.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/builtin-blame.c b/builtin-blame.c
index 682edba..3442d28 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 b57a88a..8d3f742 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))
--
1.5.2.rc0.792.g7f4bd0
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html