From 6ebb5b487168e8937e185b69bf6a6a5cb61b023f Mon Sep 17 00:00:00 2001 From: Derrick Stolee Date: Wed, 30 Dec 2020 09:46:45 -0500 Subject: [PATCH] gvfs-helper-client: remove odb check This check verifies that the ODB matches what we supplied, but there are some subtleties around Windows path names that can cause inexact matches to be logically the same. Since this check is really intended only for debugging and development purposes, let's remove it for now as a quick workaround. Signed-off-by: Derrick Stolee --- gvfs-helper-client.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/gvfs-helper-client.c b/gvfs-helper-client.c index 90251998917e40..e6fbb6ed1a43c3 100644 --- a/gvfs-helper-client.c +++ b/gvfs-helper-client.c @@ -168,28 +168,6 @@ static int gh_client__send__objects_prefetch(struct child_process *process, return 0; } -/* - * Verify that the pathname found in the "odb" response line matches - * what we requested. - * - * Since we ALWAYS send a "--shared-cache=" arg to "gvfs-helper", - * we should be able to verify that the value is what we requested. - * In particular, I don't see a need to try to search for the response - * value in from our list of alternates. - */ -static void gh_client__verify_odb_line(const char *line) -{ - const char *v1_odb_path; - - if (!skip_prefix(line, "odb ", &v1_odb_path)) - BUG("verify_odb_line: invalid line '%s'", line); - - if (!gh_client__chosen_odb || - strcmp(v1_odb_path, gh_client__chosen_odb->path)) - BUG("verify_odb_line: unexpeced odb path '%s' vs '%s'", - v1_odb_path, gh_client__chosen_odb->path); -} - /* * Update the loose object cache to include the newly created * object. @@ -291,7 +269,7 @@ static int gh_client__objects__receive_response( break; if (starts_with(line, "odb")) { - gh_client__verify_odb_line(line); + /* trust that this matches what we expect */ } else if (starts_with(line, "packfile")) {