Merge branch 'js/add-i-mingw'

diff --git a/mailmap.c b/mailmap.c
index 30614343213442806c5fbc28e904639d35c670cf..a7969c4c2e45df4f139c0bc85520f3bbc34da619 100644 (file)
--- a/mailmap.c
+++ b/mailmap.c
@@ -153,8 +153,7 @@ static void read_mailmap_line(struct string_list *map, char *buffer,
                if (!strncmp(buffer, abbrev, abblen)) {
                        char *cp;
 
-                       if (repo_abbrev)
-                               free(*repo_abbrev);
+                       free(*repo_abbrev);
                        *repo_abbrev = xmalloc(len);
 
                        for (cp = buffer + abblen; isspace(*cp); cp++)