Skip to content

Revert "gvfs: add a perf test for reading the index" #31

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
benpeart merged 2 commits into from
Oct 10, 2018
Merged

Revert "gvfs: add a perf test for reading the index" #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bba652
Revert "gvfs: add a perf test for reading the index"
benpeart Oct 8, 2018
e4e9b68
read-cache: remove the GVFS specific optimization to verify_hdr()
benpeart Oct 8, 2018
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
4 changes: 2 additions & 2 deletions Documentation/config.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,9 +972,9 @@ core.gvfs::
below can be used to turn on specific features.
+
--
GVFS_SKIP_SHA_ON_INDEX_READ::
GVFS_SKIP_SHA_ON_INDEX::
Bit value 1
Disables the calculation and validation of the sha when reading the index
Disables the calculation of the sha when writing the index
GVFS_MISSING_OK::
Bit value 4
Normally git write-tree ensures that the objects referenced by the
Expand Down
3 changes: 0 additions & 3 deletions read-cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1669,9 +1669,6 @@ static int verify_hdr(struct cache_header *hdr, unsigned long size)
if (!verify_index_checksum)
return 0;

if (gvfs_config_is_set(GVFS_SKIP_SHA_ON_INDEX))
return 0;

the_hash_algo->init_fn(&c);
the_hash_algo->update_fn(&c, hdr, size - the_hash_algo->rawsz);
the_hash_algo->final_fn(hash, &c);
Expand Down
4 changes: 0 additions & 4 deletions t/perf/p0002-read-cache.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,4 @@ test_perf "read_cache/discard_cache $count times" "
test-tool read-cache $count
"

test_perf "read_cache/discard_cache $count times with core.gvfs flag on" "
git config core.gvfs 1
test-read-cache $count
"
test_done