aboutsummaryrefslogtreecommitdiffstats
path: root/references.go
diff options
context:
space:
mode:
authorMáximo Cuadros <mcuadros@gmail.com>2016-02-25 10:18:48 +0100
committerMáximo Cuadros <mcuadros@gmail.com>2016-02-25 10:18:48 +0100
commit5bc563727ffa798caee3b007c366eb66c3d69caa (patch)
tree6107f49405bb605793f1bcd7ef4961ceadcb11e9 /references.go
parent07ca1ac7f3058ea6d3274a01973541fb84782f5e (diff)
parent0d999e1db6cd8736ab697de8ce848fa3a5274b9f (diff)
downloadgo-git-5bc563727ffa798caee3b007c366eb66c3d69caa.tar.gz
Merge pull request #34 from scjalliance/object-reader-writer
Refactor to use core.ObjectReader and core.ObjectWriter
Diffstat (limited to 'references.go')
-rw-r--r--references.go10
1 files changed, 8 insertions, 2 deletions
diff --git a/references.go b/references.go
index 593b975..29f9a71 100644
--- a/references.go
+++ b/references.go
@@ -178,7 +178,10 @@ func patch(c *Commit, path string) ([]diffmatchpatch.Diff, error) {
if err != nil {
return nil, err
}
- content := file.Contents()
+ content, err := file.Contents()
+ if err != nil {
+ return nil, err
+ }
// get contents of the file in the first parent of the commit
var contentParent string
@@ -191,7 +194,10 @@ func patch(c *Commit, path string) ([]diffmatchpatch.Diff, error) {
if err != nil {
contentParent = ""
} else {
- contentParent = file.Contents()
+ contentParent, err = file.Contents()
+ if err != nil {
+ return nil, err
+ }
}
// compare the contents of parent and child