diff options
author | Máximo Cuadros <mcuadros@gmail.com> | 2017-04-06 14:42:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-06 14:42:15 +0200 |
commit | 8ede7794a674fd890147f81201e25ecb517046f0 (patch) | |
tree | 0e2517a340166e543d4fd1bdc033a0e26bc0482c /plumbing/object/change.go | |
parent | 31a249d0d5b71bc0f374d3297247d89808263a8b (diff) | |
parent | fcfeefbde8fd69aa1f3a059713988f61e59f64f1 (diff) | |
download | go-git-8ede7794a674fd890147f81201e25ecb517046f0.tar.gz |
Merge pull request #324 from ajnavarro/fix/changes-file-for-non-files-no-error
object: fix Change.Files() method behavior (fix #317)
Diffstat (limited to 'plumbing/object/change.go')
-rw-r--r-- | plumbing/object/change.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/plumbing/object/change.go b/plumbing/object/change.go index d29836d..2f702e4 100644 --- a/plumbing/object/change.go +++ b/plumbing/object/change.go @@ -46,6 +46,10 @@ func (c *Change) Files() (from, to *File, err error) { if action == merkletrie.Insert || action == merkletrie.Modify { to, err = c.To.Tree.TreeEntryFile(&c.To.TreeEntry) + if !c.To.TreeEntry.Mode.IsFile() { + return nil, nil, nil + } + if err != nil { return } @@ -53,6 +57,10 @@ func (c *Change) Files() (from, to *File, err error) { if action == merkletrie.Delete || action == merkletrie.Modify { from, err = c.From.Tree.TreeEntryFile(&c.From.TreeEntry) + if !c.From.TreeEntry.Mode.IsFile() { + return nil, nil, nil + } + if err != nil { return } |