builtin/merge-tree: convert remaining caller of get_sha1 to object_id

[thirdparty/git.git] / transport.c

diff --git a/transport.c b/transport.c
index b9995306f259da0a929babdfe1fb5b99eaacead8..d75ff0514d8d4dd05da1d618ddf2602e5a4f26a9 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -1146,8 +1146,7 @@ void transport_unlock_pack(struct transport *transport)
 {
        if (transport->pack_lockfile) {
                unlink_or_warn(transport->pack_lockfile);
-               free(transport->pack_lockfile);
-               transport->pack_lockfile = NULL;
+               FREE_AND_NULL(transport->pack_lockfile);
        }
 }