Skip to content

gvfs-helper-client: remove odb check #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 14, 2021
Merged

gvfs-helper-client: remove odb check #306

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 1 addition & 23 deletions gvfs-helper-client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=<path>" 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.
Expand Down Expand Up @@ -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")) {
Expand Down