summary refs log tree commit diff
path: root/mailmap.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-11 15:00:43 -0700
committerJunio C Hamano <gitster@pobox.com>2013-09-11 15:00:43 -0700
commite5229b6a61fefcacd63d11afd49f0cdafaa60801 (patch)
treef4ada72f9054df19056a86bde7d3fcd7b5e668c5 /mailmap.c
parent0a3bc7d298408951630bbc6ac8e773659f900943 (diff)
parentc9ba31f592ccf23dc2aa78a705a790341ea72cfd (diff)
Merge branch 'sb/mailmap-freeing-NULL-is-ok'
* sb/mailmap-freeing-NULL-is-ok:
  mailmap: remove redundant check for freeing memory
Diffstat (limited to 'mailmap.c')
-rw-r--r--mailmap.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mailmap.c b/mailmap.c
index 3061434321..a7969c4c2e 100644
--- 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++)