From: "Derrick Stolee via GitGitGadget" <gitgitgadget@gmail•com>
To: git@vger•kernel.org
Cc: christian.couder@gmail•com, gitster@pobox•com,
johannes.schindelin@gmx•de, johncai86@gmail•com,
jonathantanmy@google•com, karthik.188@gmail•com,
kristofferhaugsbakk@fastmail•com, me@ttaylorr•com,
newren@gmail•com, peff@peff•net, ps@pks•im,
Derrick Stolee <stolee@gmail•com>,
Derrick Stolee <stolee@gmail•com>
Subject: [PATCH 2/3] path-walk: fix setup of pending objects
Date: Wed, 20 Aug 2025 18:39:55 +0000 [thread overview]
Message-ID: <0dc4a6323e66598070b403d286ee1918e6a9b791.1755715196.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1956.git.1755715196.gitgitgadget@gmail.com>
From: Derrick Stolee <stolee@gmail•com>
The previous change established a buggy instance of 'git repack -adf
--path-walk' when there exist paths that are tracked in the index and
that is the only instance of those paths in the history of the
repository. This change fixes that bug.
The core problem here is that the "maybe_interesting" member of 'struct
type_and_oid_list' is not initialized to '1'. This member was added in
6333e7ae0b (path-walk: mark trees and blobs as UNINTERESTING,
2024-12-20) in a way to help when creating packfiles for a small commit
range using the sparse path algorithm (enabled by pack.useSparse=true).
The idea here is that the list is marked as "maybe_interesting" if an
object is added that does not have the UNINITERSTING flag on it. Later,
this is checked again in case all objects in the list were marked
UNINTERESTING after that point in time. In this case, the algorithm
skips the list as there is no reason to visit it.
This leads to the problem where the "maybe_interesting" member was not
appropriately initialized when the list is created from pending objects.
This is the fix for now.
To help avoid this from happening in the future, a follow-up change will
make initializing lists use a shared method instead of allowing for an
update to this initialization process to miss some existing copies.
Signed-off-by: Derrick Stolee <stolee@gmail•com>
---
path-walk.c | 2 ++
t/t7700-repack.sh | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/path-walk.c b/path-walk.c
index 2d4ddbadd50f..1215ed398f4f 100644
--- a/path-walk.c
+++ b/path-walk.c
@@ -385,6 +385,7 @@ static int setup_pending_objects(struct path_walk_info *info,
list->type = OBJ_TREE;
strmap_put(&ctx->paths_to_lists, path, list);
}
+ list->maybe_interesting = 1;
oid_array_append(&list->oids, &obj->oid);
free(path);
} else {
@@ -404,6 +405,7 @@ static int setup_pending_objects(struct path_walk_info *info,
list->type = OBJ_BLOB;
strmap_put(&ctx->paths_to_lists, path, list);
}
+ list->maybe_interesting = 1;
oid_array_append(&list->oids, &obj->oid);
} else {
/* assume a root tree, such as a lightweight tag. */
diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
index 1998d9bf291c..030e9e5b2dc7 100755
--- a/t/t7700-repack.sh
+++ b/t/t7700-repack.sh
@@ -838,7 +838,7 @@ test_expect_success '-n overrides repack.updateServerInfo=true' '
test_server_info_missing
'
-test_expect_failure 'pending objects are repacked appropriately' '
+test_expect_success 'pending objects are repacked appropriately' '
git init pending &&
(
--
gitgitgadget
next prev parent reply other threads:[~2025-08-20 18:40 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-20 18:39 [PATCH 0/3] [2.51.0 Bug] Missing singleton objects in 'git repack -adf --path-walk' Derrick Stolee via GitGitGadget
2025-08-20 18:39 ` [PATCH 1/3] t7700: add failing --path-walk test Derrick Stolee via GitGitGadget
2025-08-21 8:00 ` Patrick Steinhardt
2025-08-21 12:42 ` Derrick Stolee
2025-08-21 16:22 ` Junio C Hamano
2025-08-21 23:21 ` Elijah Newren
2025-08-20 18:39 ` Derrick Stolee via GitGitGadget [this message]
2025-08-20 19:02 ` [PATCH 2/3] path-walk: fix setup of pending objects Junio C Hamano
2025-08-20 19:42 ` Derrick Stolee
2025-08-21 8:01 ` Patrick Steinhardt
2025-08-21 12:55 ` Derrick Stolee
2025-08-21 8:01 ` Patrick Steinhardt
2025-08-21 20:33 ` Derrick Stolee
2025-08-21 23:21 ` Elijah Newren
2025-08-20 18:39 ` [PATCH 3/3] path-walk: create initializer for path lists Derrick Stolee via GitGitGadget
2025-08-21 23:22 ` Elijah Newren
2025-08-25 12:49 ` [PATCH v2 0/2] [2.51.0 Bug] Missing singleton objects in 'git repack -adf --path-walk' Derrick Stolee via GitGitGadget
2025-08-25 12:49 ` [PATCH v2 1/2] path-walk: fix setup of pending objects Derrick Stolee via GitGitGadget
2025-08-25 12:49 ` [PATCH v2 2/2] path-walk: create initializer for path lists Derrick Stolee via GitGitGadget
2025-08-26 15:03 ` [PATCH v2 0/2] [2.51.0 Bug] Missing singleton objects in 'git repack -adf --path-walk' Elijah Newren
2025-08-26 15:58 ` Junio C Hamano
2025-09-02 11:19 ` Patrick Steinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0dc4a6323e66598070b403d286ee1918e6a9b791.1755715196.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail$(echo .)com \
--cc=christian.couder@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=johncai86@gmail$(echo .)com \
--cc=jonathantanmy@google$(echo .)com \
--cc=karthik.188@gmail$(echo .)com \
--cc=kristofferhaugsbakk@fastmail$(echo .)com \
--cc=me@ttaylorr$(echo .)com \
--cc=newren@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=ps@pks$(echo .)im \
--cc=stolee@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox