8000 utils: merkletrie, Fix diff on sparse-checkout index. Fixes #1406 by onee-only · Pull Request #1492 · go-git/go-git · GitHub
[go: up one dir, main page]
Skip to content

utils: merkletrie, Fix diff on sparse-checkout index. Fixes #1406 #1492

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
merged 2 commits into from
Apr 14, 2025
Merged

utils: merkletrie, Fix diff on sparse-checkout index. Fixes #1406 #1492

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
9dc151a
utils: merkletrie, Fix diff on sparse-checkout index. Fixes #1406
onee-only Apr 7, 2025
e8c9fcd
utils: merkletrie, Simplify DiffTreeContext.
onee-only Apr 14, 2025
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: 3 additions & 1 deletion utils/merkletrie/change.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,9 @@ func (l *Changes) addRecursive(root noder.Path, ctor noderToChangeFn) error {
}

if !root.IsDir() {
l.Add(ctor(root))
if !root.Skip() {
l.Add(ctor(root))
}
return nil
}

Expand Down
43 changes: 20 additions & 23 deletions utils/merkletrie/difftree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,18 +297,16 @@ func DiffTreeContext(ctx context.Context, fromTree, toTree noder.Noder,
case noMoreNoders:
return ret, nil
case onlyFromRemains:
if err = ret.AddRecursiveDelete(from); err != nil {
return nil, err
if !from.Skip() {
if err = ret.AddRecursiveDelete(from); err != nil {
return nil, err
}
}
if err = ii.nextFrom(); err != nil {
return nil, err
}
case onlyToRemains:
if to.Skip() {
if err = ret.AddRecursiveDelete(to); err != nil {
return nil, err
}
} else {
if !to.Skip() {
if err = ret.AddRecursiveInsert(to); err != nil {
return nil, err
}
Expand All @@ -317,26 +315,25 @@ func DiffTreeContext(ctx context.Context, fromTree, toTree noder.Noder,
return nil, err
}
case bothHaveNodes:
if from.Skip() {
if err = ret.AddRecursiveDelete(from); err != nil {
return nil, err
}
if err := ii.nextBoth(); err != nil {
return nil, err
var err error
switch {
case from.Skip():
if from.Name() == to.Name() {
err = ii.nextBoth()
} else {
err = ii.nextFrom()
}
break
}
if to.Skip() {
if err = ret.AddRecursiveDelete(to); err != nil {
return nil, err
}
if err := ii.nextBoth(); err != nil {
return nil, err
case to.Skip():
if from.Name() == to.Name() {
err = ii.nextBoth()
} else {
err = ii.nextTo()
}
break
default:
err = diffNodes(&ret, ii)
}

if err = diffNodes(&ret, ii); err != nil {
if err != nil {
return nil, err
}
default:
Expand Down
18 changes: 18 additions & 0 deletions worktree_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1373,6 +1373,24 @@ func (s *WorktreeSuite) TestStatusAfterCheckout() {
s.True(status.IsClean())
}

func (s *WorktreeSuite) TestStatusAfterSparseCheckout() {
fs := memfs.New()
w := &Worktree{
r: s.Repository,
Filesystem: fs,
}

err := w.Checkout(&CheckoutOptions{
SparseCheckoutDirectories: []string{"php"},
Force: true,
})
s.Require().NoError(err)

status, err := w.Status()
s.Require().NoError(err)
s.True(status.IsClean(), status)
}

func (s *WorktreeSuite) TestStatusModified() {
fs := s.TemporalFilesystem()

Expand Down
Loading
0