From 14c50b2096166eb8128702cadec0a72791a64cd6 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 25 Feb 2025 21:55:05 +0100 Subject: [PATCH] fixup??? path-walk API: avoid adding a root tree more than once This is an incorrect left-over of a previous iteration. Signed-off-by: Johannes Schindelin --- path-walk.c | 4 +--- t/t6601-path-walk.sh | 22 ---------------------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/path-walk.c b/path-walk.c index 88885508f98789..341bdd2ba4ef46 100644 --- a/path-walk.c +++ b/path-walk.c @@ -344,11 +344,9 @@ static int setup_pending_objects(struct path_walk_info *info, struct object *obj = pending->item; /* Commits will be picked up by revision walk. */ - if (obj->type == OBJ_COMMIT || obj->flags & SEEN) + if (obj->type == OBJ_COMMIT) continue; - obj->flags |= SEEN; - /* Navigate annotated tag object chains. */ while (obj->type == OBJ_TAG) { struct tag *tag = lookup_tag(info->revs->repo, &obj->oid); diff --git a/t/t6601-path-walk.sh b/t/t6601-path-walk.sh index b970700d3fbaac..c89b0f1e19d9fb 100755 --- a/t/t6601-path-walk.sh +++ b/t/t6601-path-walk.sh @@ -397,26 +397,4 @@ test_expect_success 'trees are reported exactly once' ' test_line_count = 1 out-filtered ' -test_expect_success 'trees are reported exactly once' ' - test_when_finished "rm -rf unique-trees" && - test_create_repo unique-trees && - ( - cd unique-trees && - mkdir initial && - test_commit initial/file && - - git switch -c move-to-top && - git mv initial/file.t ./ && - test_tick && - git commit -m moved && - - git update-ref refs/heads/other HEAD - ) && - - test-tool -C unique-trees path-walk -- --all >out && - tree=$(git -C unique-trees rev-parse HEAD:) && - grep "$tree" out >out-filtered && - test_line_count = 1 out-filtered -' - test_done