commit-graph: avoid leaking topo_levels slab in write_commit_graph()

[thirdparty/git.git] / mailmap.c

diff --git a/mailmap.c b/mailmap.c
index eb77c6e77cebf517c989cb0a072e9ead77fd6350..9bb9cf8b3038aa8234accc4832178ee498062c59 100644 (file)
--- a/mailmap.c
+++ b/mailmap.c
@@ -225,7 +225,8 @@ int read_mailmap(struct string_list *map)
        if (!git_mailmap_blob && is_bare_repository())
                git_mailmap_blob = "HEAD:.mailmap";
 
-       err |= read_mailmap_file(map, ".mailmap");
+       if (!startup_info->have_repository || !is_bare_repository())
+               err |= read_mailmap_file(map, ".mailmap");
        if (startup_info->have_repository)
                err |= read_mailmap_blob(map, git_mailmap_blob);
        err |= read_mailmap_file(map, git_mailmap_file);