read_branches_file: plug a FILE* leak

The earlier rewrite f28e3ab2 (read_branches_file: simplify string handling)
of read_branches_file() lost an fclose() call. Put it back.

As on Windows files that are open cannot be removed, the leak manifests in
a failure of 'git remote rename origin origin' when the remote's URL is
specified in .git/branches/origin, because by the time that the command
attempts to remove this file, it is still open.

Signed-off-by: Johannes Sixt <redacted>
Acked-by: Jeff King <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/remote.c b/remote.c
index 1101f82eaf34b936d51e0d61837c568b3691a468..fb161530cdd5e286716d45532c1d58da26250e22 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -282,6 +282,7 @@ static void read_branches_file(struct remote *remote)
                return;
 
        strbuf_getline(&buf, f, '\n');
+       fclose(f);
        strbuf_trim(&buf);
        if (!buf.len) {
                strbuf_release(&buf);