Merge branch 'st/lib-gpg-kill-stray-agent'

diff --git a/remote-testsvn.c b/remote-testsvn.c
index e034ea00d49c81675d664085c0d67763609bfd8a..0ff4a312629d4ed4250a076f39a9d78e76917158 100644 (file)
--- a/remote-testsvn.c
+++ b/remote-testsvn.c
@@ -66,8 +66,7 @@ static char *read_ref_note(const struct object_id *oid)
        else if (!msglen || type != OBJ_BLOB) {
                error("Note contains unusable content. "
                        "Is something else using this notes tree? %s", notes_ref);
-               free(msg);
-               msg = NULL;
+               FREE_AND_NULL(msg);
        }
        free_notes(NULL);
        return msg;