Skip to content

Commit

Permalink
fixup??? path-walk API: avoid adding a root tree more than once
Browse files Browse the repository at this point in the history
This is an incorrect left-over of a previous iteration.

Signed-off-by: Johannes Schindelin <[email protected]>
  • Loading branch information
dscho authored and Git for Windows Build Agent committed Feb 25, 2025
1 parent 3833bcc commit 14c50b2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 25 deletions.
4 changes: 1 addition & 3 deletions path-walk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
22 changes: 0 additions & 22 deletions t/t6601-path-walk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 14c50b2

Please sign in to comment.