From 5735dc5a0df5de12b28237ff2c41df6df5f67b81 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sat, 5 Mar 2016 17:13:29 -0500 Subject: mailmap: do not resolve blobs in a non-repository The mailmap code may be triggered outside of a repository by git-shortlog. There is no point in looking up a name like "HEAD:.mailmap" there; without a repository, we have no refs. This is unlikely to matter much in practice for the current code, as we would simply fail to find the ref. But as the refs code learns about new backends, this is more important; without a repository, we do not even know which backend to look at. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano diff --git a/mailmap.c b/mailmap.c index f4a0f1c..9726237 100644 --- a/mailmap.c +++ b/mailmap.c @@ -250,7 +250,8 @@ int read_mailmap(struct string_list *map, char **repo_abbrev) git_mailmap_blob = "HEAD:.mailmap"; err |= read_mailmap_file(map, ".mailmap", repo_abbrev); - err |= read_mailmap_blob(map, git_mailmap_blob, repo_abbrev); + if (startup_info->have_repository) + err |= read_mailmap_blob(map, git_mailmap_blob, repo_abbrev); err |= read_mailmap_file(map, git_mailmap_file, repo_abbrev); return err; } -- cgit v0.10.2-6-g49f6