summaryrefslogtreecommitdiff
path: root/packfile.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2019-04-05 18:06:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-04-16 07:58:21 (GMT)
commitfc78915674ff1bca1726348d7c434dfa0048a5d7 (patch)
treea9ad9e7e74fcdbd4121b36a2569fa27407283a7f /packfile.h
parent013fd7ada3c81cec8f0c48427c77394028707c2e (diff)
downloadgit-fc78915674ff1bca1726348d7c434dfa0048a5d7.zip
git-fc78915674ff1bca1726348d7c434dfa0048a5d7.tar.gz
git-fc78915674ff1bca1726348d7c434dfa0048a5d7.tar.bz2
packfile: fix pack basename computation
When we have a multi-pack-index that covers many packfiles, we try to avoid opening the .idx for those packfiles. To do that we feed the pack name to midx_contains_pack(). But that function wants to see only the basename, which we compute using strrchr() to find the final slash. But that leaves an extra "/" at the start of our string. We can fix this by incrementing the pointer. That also raises the question of what to do when the name does not have a '/' at all. This should generally not happen (we always find files in "pack/"), but it doesn't hurt to be defensive here. Let's wrap all of that up in a helper function and make it publicly available, since a later patch will need to use it, too. The tests don't notice because there's nothing about opening those .idx files that would cause us to give incorrect output. It's just a little slower. The new test checks this case by corrupting the covered .idx, and then making sure we don't complain about it. We also have to tweak t5570, which intentionally corrupts a .idx file and expects us to notice it. When run with GIT_TEST_MULTI_PACK_INDEX, this will fail since we now will (correctly) not bother opening the .idx at all. We can fix that by unconditionally dropping any midx that's there, which ensures we'll have to read the .idx. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'packfile.h')
-rw-r--r--packfile.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/packfile.h b/packfile.h
index ea7a690..fe05fe0 100644
--- a/packfile.h
+++ b/packfile.h
@@ -31,6 +31,12 @@ char *sha1_pack_name(const unsigned char *sha1);
*/
char *sha1_pack_index_name(const unsigned char *sha1);
+/*
+ * Return the basename of the packfile, omitting any containing directory
+ * (e.g., "pack-1234abcd[...].pack").
+ */
+const char *pack_basename(struct packed_git *p);
+
struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);
typedef void each_file_in_pack_dir_fn(const char *full_path, size_t full_path_len,