Signed-off-by: noClaps git@zerolimits.dev
+34
knotserver/git/diff.go
+34
knotserver/git/diff.go
···
98
98
return &nd, nil
99
99
}
100
100
101
+
func (g *GitRepo) DiffTree(commit1, commit2 *object.Commit) (*types.DiffTree, error) {
102
+
tree1, err := commit1.Tree()
103
+
if err != nil {
104
+
return nil, err
105
+
}
106
+
107
+
tree2, err := commit2.Tree()
108
+
if err != nil {
109
+
return nil, err
110
+
}
111
+
112
+
diff, err := object.DiffTree(tree1, tree2)
113
+
if err != nil {
114
+
return nil, err
115
+
}
116
+
117
+
patch, err := diff.Patch()
118
+
if err != nil {
119
+
return nil, err
120
+
}
121
+
122
+
diffs, _, err := gitdiff.Parse(strings.NewReader(patch.String()))
123
+
if err != nil {
124
+
return nil, err
125
+
}
126
+
127
+
return &types.DiffTree{
128
+
Rev1: commit1.Hash.String(),
129
+
Rev2: commit2.Hash.String(),
130
+
Patch: patch.String(),
131
+
Diff: diffs,
132
+
}, nil
133
+
}
134
+
101
135
// FormatPatch generates a git-format-patch output between two commits,
102
136
// and returns the raw format-patch series, a parsed FormatPatch and an error.
103
137
func (g *GitRepo) formatSinglePatch(commit plumbing.Hash, extraArgs ...string) (string, *types.FormatPatch, error) {
knotserver/git/git.go
knotserver/git/git.go
This file has not been changed.
knotserver/http_util.go
knotserver/http_util.go
This file has not been changed.
History
2 rounds
1 comment
handle.invalid
submitted
#1
1 commit
expand
collapse
ee2c1a79
knotserver: remove unused functions
Signed-off-by: noClaps <git@zerolimits.dev>
expand 1 comment
pull request successfully merged
handle.invalid
submitted
#0
1 commit
expand
collapse
900d2118
knotserver: remove unused functions
Signed-off-by: noClaps <git@zerolimits.dev>
nice, thanks!