diff options
| author |  Alex Riesen <raa.lkml@gmail.com> | 2007-05-01 00:27:05 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-04-30 16:57:52 -0700 |
| commit | e44b5d106c2934b93cfba2ea7fb2ed1e32edaae2 (patch) | |
| tree | 48e3f8ed4347741b6f9644b23ada1ec9bda77364 | |
| parent | Fix read_mailmap to handle a caller uninterested in repo abbreviation (diff) | |
| download | tgif-e44b5d106c2934b93cfba2ea7fb2ed1e32edaae2.tar.xz | |
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>
| -rw-r--r-- | builtin-blame.c | 2 | ||||
| -rw-r--r-- | builtin-shortlog.c | 3 |
2 files changed, 2 insertions, 3 deletions
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)) |