aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md7
-rw-r--r--clients/common.go2
-rw-r--r--references_test.go2
3 files changed, 8 insertions, 3 deletions
diff --git a/README.md b/README.md
index 6347dc7..9ad0dca 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,11 @@ You can obtain all this information using the standard `git` command running ove
*Yes!!!*, we have been using *go-git* at [source{d}](http://sourced.tech) since August 2015 to analyze all GitHub public repositories (i.e. 16M of repositories).
+### Coming Soon
+
+Blame support: right now we are using a forward version of a line-tracking
+algorithm and we are having some problems handling merges. The plan is to get
+merges right and change to a backward line-tracking algorithm soon.
Installation
------------
@@ -84,7 +89,7 @@ Date: 2015-12-11 17:57:10 +0100 +0100
Acknowledgements
----------------
-The earlies versions of the [packfile reader](https://godoc.org/gopkg.in/src-d/go-git.v2/formats/packfile) is based on [git-chain](https://github.com/gitchain/gitchain/blob/master/git/pack.go) project done by [@yrashk](https://github.com/yrashk)
+The earlier versions of the [packfile reader](https://godoc.org/gopkg.in/src-d/go-git.v2/formats/packfile) are based on [git-chain](https://github.com/gitchain/gitchain/blob/master/git/pack.go), project done by [@yrashk](https://github.com/yrashk)
License
diff --git a/clients/common.go b/clients/common.go
index 039404d..f7868cf 100644
--- a/clients/common.go
+++ b/clients/common.go
@@ -47,7 +47,7 @@ func InstallProtocol(scheme string, service common.GitUploadPackService) {
KnownProtocols[scheme] = service
}
-// NewGitUploadPackService returns the appropiate upload pack service
+// NewGitUploadPackService returns the appropriate upload pack service
// among of the set of known protocols: HTTP, SSH. See `InstallProtocol`
// to add or modify protocols.
func NewGitUploadPackService(repoURL string) (common.GitUploadPackService, error) {
diff --git a/references_test.go b/references_test.go
index ddc1e05..4fa4f76 100644
--- a/references_test.go
+++ b/references_test.go
@@ -358,7 +358,7 @@ func compareSideBySide(a []string, b []*Commit) string {
var cherryPicks = [...][]string{
// repo, path, commit a, commit b
- []string{"https://github.com/jamesob/desk.git", "desk", "094d0e7d5d69141c98a606910ba64786c5565da0", "3f34438d54f4a1ca86db8c0f03ed8eb38f20e22c"},
+ {"https://github.com/jamesob/desk.git", "desk", "094d0e7d5d69141c98a606910ba64786c5565da0", "3f34438d54f4a1ca86db8c0f03ed8eb38f20e22c"},
}
// should detect cherry picks