Merge branches 'lh/submodules' and 'pb/am'

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))