Merge branch 'jm/free'

* jm/free:
  Avoid unnecessary "if-before-free" tests.

Conflicts:

	builtin-branch.c

1 files changed, 1 insertions, 2 deletions

diff --git a/connect.c b/connect.c
index 5ac3572784..d12b105970 100644
--- a/connect.c
+++ b/connect.c
@@ -68,8 +68,7 @@ struct ref **get_remote_heads(int in, struct ref **list,
 
 		name_len = strlen(name);
 		if (len != name_len + 41) {
-			if (server_capabilities)
-				free(server_capabilities);
+			free(server_capabilities);
 			server_capabilities = xstrdup(name + name_len + 1);
 		}