Merge pull request #157 from vmarkovtsev/master

Fix filtering by language

Author: vmarkovtsev

Gopkg.lock

@@ -63,7 +63,7 @@
   name = "gopkg.in/cheggaaa/pb.v1"
 
 [[constraint]]
-  branch = "master"
+  version = "v1.6.7"
   name = "gopkg.in/src-d/enry.v1"
 
 [[constraint]]

Gopkg.toml

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"path"
 	"regexp"
 	"strings"
 
@@ -261,11 +262,14 @@ func (treediff *TreeDiff) checkLanguage(name string, blobHash plumbing.Hash) (bo
 		return false, err
 	}
 	buffer := make([]byte, 1024)
-	_, err = reader.Read(buffer)
+	n, err := reader.Read(buffer)
 	if err != nil {
 		return false, err
 	}
-	lang := enry.GetLanguage(name, buffer)
+	if n < len(buffer) {
+		buffer = buffer[:n]
+	}
+	lang := enry.GetLanguage(path.Base(name), buffer)
 	return treediff.Languages[lang], nil
 }
 

internal/plumbing/tree_diff.go

@@ -247,3 +247,12 @@ func TestTreeDiffFork(t *testing.T) {
 	assert.Equal(t, td1.previousTree, td2.previousTree)
 	td1.Merge([]core.PipelineItem{td2})
 }
+
+func TestTreeDiffCheckLanguage(t *testing.T) {
+	td := fixtureTreeDiff()
+	td.Languages["Go"] = true
+	lang, err := td.checkLanguage(
+		"version.go", plumbing.NewHash("975f35a1412b8ae79b5ba2558f71f41e707fd5a9"))
+	assert.Nil(t, err)
+	assert.True(t, lang)
+}