Merge branch 'sb/mailmap-freeing-NULL-is-ok'

* sb/mailmap-freeing-NULL-is-ok: mailmap: remove redundant check for freeing memory
2013-09-11 15:00:43 -07:00 · 2013-09-11 15:00:43 -07:00 · e5229b6a61
commit e5229b6a61
parent 0a3bc7d298 c9ba31f592
1 changed files with 1 additions and 2 deletions
--- 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++)