Diff Staging with Worktree

[ghost]

I want to Diff Staging with Worktree. I found diffStagingWithWorktree:

go-git/worktree_status.go

Line 116 in d525a51

func (w *Worktree) diffStagingWithWorktree(reverse bool) (merkletrie.Changes, error) {

but it returns a merkletrie.Changes. To make use of that, it would need to be converted to object.Changes. I found function newChanges:

go-git/plumbing/object/change_adaptor.go

Line 50 in d525a51

func newChanges(src merkletrie.Changes) (Changes, error) {

but it is not public. I tried just copying the function into my code, but that does work as it calls another private function newChange:

go-git/plumbing/object/change_adaptor.go

Line 14 in d525a51

func newChange(c merkletrie.Change) (*Change, error) {

which calls another private function newChangeEntry:

go-git/plumbing/object/change_adaptor.go

Line 29 in d525a51

func newChangeEntry(p noder.Path) (ChangeEntry, error) {

which calls a private struct treeNoder:

go-git/plumbing/object/treenoder.go

Line 19 in d525a51

type treeNoder struct {

after that I gave up.

[ghost]

looks like what I want is the Encode method:

https://godocs.io/github.com/go-git/go-git/v5/plumbing/format/diff#UnifiedEncoder.Encode

which requires the Patch interface:

https://godocs.io/github.com/go-git/go-git/v5/plumbing/format/diff#Patch

which is implemented by object.Patch:

https://godocs.io/github.com/go-git/go-git/v5/plumbing/object#Patch

assuming the following functions were exported, we could call diffStagingWithWorktree:

go-git/worktree_status.go

Line 116 in 7e345bb

func (w *Worktree) diffStagingWithWorktree(reverse bool) (merkletrie.Changes, error) {

then call newChanges:

go-git/plumbing/object/change_adaptor.go

Line 50 in 7e345bb

func newChanges(src merkletrie.Changes) (Changes, error) {

then call Patch:

go-git/plumbing/object/change.go

Line 149 in 7e345bb

func (c Changes) Patch() (*Patch, error) {

until those functions are exported, the Patch interface has to be manually implemented. I found some such code here:

https://github.com/fhs/gig/blob/dd59dc92/cli/diff.go#L181-L187

[headyj]

@1268 did you manage to make it work like this? I'm also struggling with the same case: I basically want to execute the equivalent of git diff --cached to get an output of the differences between staging and worktree

[ghost]

@headyj yeah I found a solution, but:

I basically want to execute the equivalent of git diff --cached to get an output of the differences between staging and worktree

is not true. staging to worktree is git diff. HEAD to staging is git diff --cached

[headyj]

True @1268 , but I guess I can use the same principle for my case and it should work. Did you just do what you wrote on your first post or did you add something else to make it work?

[ghost]

you should clarify what you are wanting, either staging to worktree or HEAD to staging. those aren't the same thing and they have very different solutions.