aboutsummaryrefslogtreecommitdiffstats
path: root/plumbing/object/tree.go
diff options
context:
space:
mode:
authorMáximo Cuadros <mcuadros@gmail.com>2017-05-23 15:38:54 +0200
committerGitHub <noreply@github.com>2017-05-23 15:38:54 +0200
commitf663a9384619965ed8df7a7224e6f15ad18ed4af (patch)
tree337a4615e7a3ef24f46cbe008944a687c6a964ac /plumbing/object/tree.go
parent2ff77a8d93529cefdca922dbed89d4b1cd0ee8e5 (diff)
parent65416cf6c0e8264cc7938fe0611998d52780e089 (diff)
downloadgo-git-f663a9384619965ed8df7a7224e6f15ad18ed4af.tar.gz
Merge pull request #388 from ajnavarro/feature/commit-diff
format/diff: unified diff encoder and public API
Diffstat (limited to 'plumbing/object/tree.go')
-rw-r--r--plumbing/object/tree.go11
1 files changed, 11 insertions, 0 deletions
diff --git a/plumbing/object/tree.go b/plumbing/object/tree.go
index 25687b0..512db9f 100644
--- a/plumbing/object/tree.go
+++ b/plumbing/object/tree.go
@@ -270,6 +270,17 @@ func (from *Tree) Diff(to *Tree) (Changes, error) {
return DiffTree(from, to)
}
+// Patch returns a slice of Patch objects with all the changes between trees
+// in chunks. This representation can be used to create several diff outputs.
+func (from *Tree) Patch(to *Tree) (*Patch, error) {
+ changes, err := DiffTree(from, to)
+ if err != nil {
+ return nil, err
+ }
+
+ return changes.Patch()
+}
+
// treeEntryIter facilitates iterating through the TreeEntry objects in a Tree.
type treeEntryIter struct {
t *Tree