Skip to content

Commit c8b017a

Browse files
derrickstoleejeffhostetler
authored andcommitted
Merge pull request #306: 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. This was originally part of #304, as I hit it more often in that effort. However, this was hit during the Scalar release process, so I'll need to generate new installers.
2 parents c3b177e + a83441b commit c8b017a

File tree

1 file changed

+1
-23
lines changed

1 file changed

+1
-23
lines changed

gvfs-helper-client.c

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -168,28 +168,6 @@ static int gh_client__send__objects_prefetch(struct child_process *process,
168168
return 0;
169169
}
170170

171-
/*
172-
* Verify that the pathname found in the "odb" response line matches
173-
* what we requested.
174-
*
175-
* Since we ALWAYS send a "--shared-cache=<path>" arg to "gvfs-helper",
176-
* we should be able to verify that the value is what we requested.
177-
* In particular, I don't see a need to try to search for the response
178-
* value in from our list of alternates.
179-
*/
180-
static void gh_client__verify_odb_line(const char *line)
181-
{
182-
const char *v1_odb_path;
183-
184-
if (!skip_prefix(line, "odb ", &v1_odb_path))
185-
BUG("verify_odb_line: invalid line '%s'", line);
186-
187-
if (!gh_client__chosen_odb ||
188-
strcmp(v1_odb_path, gh_client__chosen_odb->path))
189-
BUG("verify_odb_line: unexpeced odb path '%s' vs '%s'",
190-
v1_odb_path, gh_client__chosen_odb->path);
191-
}
192-
193171
/*
194172
* Update the loose object cache to include the newly created
195173
* object.
@@ -291,7 +269,7 @@ static int gh_client__objects__receive_response(
291269
break;
292270

293271
if (starts_with(line, "odb")) {
294-
gh_client__verify_odb_line(line);
272+
/* trust that this matches what we expect */
295273
}
296274

297275
else if (starts_with(line, "packfile")) {

0 commit comments

Comments
 (0)