Merge branch 'sb/plug-transport-leak'

gitster · gitster · commit 95d2255bfe9f · 2014-10-24T15:00:09.000-07:00
Code clean-up.

* sb/plug-transport-leak:
  .mailmap: add Stefan Bellers corporate mail address
  transport: free leaking head in transport_print_push_status()
diff --git a/.mailmap b/.mailmap
@@ -205,6 +205,7 @@ Shawn O. Pearce <spearce@spearce.org>
 Simon Hausmann <hausmann@kde.org> <simon@lst.de>
 Simon Hausmann <hausmann@kde.org> <shausman@trolltech.com>
 Stefan Beller <stefanbeller@gmail.com> <stefanbeller@googlemail.com>
+Stefan Beller <stefanbeller@gmail.com> <sbeller@google.com>
 Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@atlas-elektronik.com>
 Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@googlemail.com>
 Stefan Sperling <stsp@elego.de> <stsp@stsp.name>
diff --git a/transport.c b/transport.c
@@ -775,6 +775,7 @@ void transport_print_push_status(const char *dest, struct ref *refs,
 			*reject_reasons |= REJECT_NEEDS_FORCE;
 		}
 	}
+	free(head);
 }
 
 void transport_verify_remote_names(int nr_heads, const char **heads)

Original file line number	Diff line number	Diff line change
`@@ -775,6 +775,7 @@ void transport_print_push_status(const char dest, struct ref refs,`
`775`	`775`	`*reject_reasons \|= REJECT_NEEDS_FORCE;`
`776`	`776`	`}`
`777`	`777`	`}`
	`778`	`+ free(head);`
`778`	`779`	`}`
`779`	`780`
`780`	`781`	`void transport_verify_remote_names(int nr_heads, const char **heads)`