merge-recursive: remove final remaining caller of merge_file_one()

diff --git a/http.c b/http.c
index 4162860ee316365091ac3978a83d2311682b8079..98ff122585c4da84894ccae97db54859e45f3bec 100644 (file)
--- a/http.c
+++ b/http.c
@@ -2394,7 +2394,7 @@ int finish_http_object_request(struct http_object_request *freq)
                unlink_or_warn(freq->tmpfile.buf);
                return -1;
        }
-       if (hashcmp(freq->sha1, freq->real_sha1)) {
+       if (!hasheq(freq->sha1, freq->real_sha1)) {
                unlink_or_warn(freq->tmpfile.buf);
                return -1;
        }