Merge branch 'master' into dont-join-abs

Author: mhagger

Gopkg.lock

@@ -67,7 +67,7 @@ Is your Git repository bursting at the seams?
 
 ## Getting started
 
-1.  Make sure that you have the [Git command-line client](https://git-scm.com/) installed. NOTE: `git-sizer` invokes `git` commands to examine the contents of your repository, so **it is required that the `git` command be in your `PATH`** when you run `git-sizer`.
+1.  Make sure that you have the [Git command-line client](https://git-scm.com/) installed, **version >= 2.6**. NOTE: `git-sizer` invokes `git` commands to examine the contents of your repository, so **it is required that the `git` command be in your `PATH`** when you run `git-sizer`. 
 
 2.  Install `git-sizer`. Either:
 

README.md

@@ -7,12 +7,14 @@ import (
 	"os"
 	"os/exec"
 	"testing"
+	"time"
 
 	"github.com/github/git-sizer/counts"
 	"github.com/github/git-sizer/git"
 	"github.com/github/git-sizer/sizes"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 // Smoke test that the program runs.
@@ -24,6 +26,24 @@ func TestExec(t *testing.T) {
 	}
 }
 
+func gitCommand(t *testing.T, repo *git.Repository, args ...string) *exec.Cmd {
+	cmd := exec.Command("git", args...)
+	cmd.Env = append(os.Environ(), "GIT_DIR="+repo.Path())
+	return cmd
+}
+
+func addAuthorInfo(cmd *exec.Cmd, timestamp *time.Time) {
+	cmd.Env = append(cmd.Env,
+		"GIT_AUTHOR_NAME=Arthur",
+		"GIT_AUTHOR_EMAIL=arthur@example.com",
+		fmt.Sprintf("GIT_AUTHOR_DATE=%d -0700", timestamp.Unix()),
+		"GIT_COMMITTER_NAME=Constance",
+		"GIT_COMMITTER_EMAIL=constance@example.com",
+		fmt.Sprintf("GIT_COMMITTER_DATE=%d -0700", timestamp.Unix()),
+	)
+	*timestamp = timestamp.Add(60 * time.Second)
+}
+
 func newGitBomb(
 	repoName string, depth, breadth int, body string,
 ) (repo *git.Repository, err error) {
@@ -113,6 +133,7 @@ func pow(x uint64, n int) uint64 {
 }
 
 func TestBomb(t *testing.T) {
+	t.Parallel()
 	assert := assert.New(t)
 
 	repo, err := newGitBomb("bomb", 10, 10, "boom!\n")
@@ -157,3 +178,44 @@ func TestBomb(t *testing.T) {
 	assert.Equal(counts.Count32(0), h.MaxExpandedLinkCount, "max expanded link count")
 	assert.Equal(counts.Count32(0), h.MaxExpandedSubmoduleCount, "max expanded submodule count")
 }
+
+func TestTaggedTags(t *testing.T) {
+	t.Parallel()
+	path, err := ioutil.TempDir("", "tagged-tags")
+	require.NoError(t, err, "creating temporary directory")
+
+	defer func() {
+		os.RemoveAll(path)
+	}()
+
+	cmd := exec.Command("git", "init", path)
+	require.NoError(t, cmd.Run(), "initializing repo")
+	repo, err := git.NewRepository(path)
+	require.NoError(t, err, "initializing Repository object")
+
+	timestamp := time.Unix(1112911993, 0)
+
+	cmd = gitCommand(t, repo, "commit", "-m", "initial", "--allow-empty")
+	addAuthorInfo(cmd, &timestamp)
+	require.NoError(t, cmd.Run(), "creating commit")
+
+	// The lexicographical order of these tags is important, hence
+	// their strange names.
+	cmd = gitCommand(t, repo, "tag", "-m", "tag 1", "tag", "master")
+	addAuthorInfo(cmd, &timestamp)
+	require.NoError(t, cmd.Run(), "creating tag 1")
+
+	cmd = gitCommand(t, repo, "tag", "-m", "tag 2", "bag", "tag")
+	addAuthorInfo(cmd, &timestamp)
+	require.NoError(t, cmd.Run(), "creating tag 2")
+
+	cmd = gitCommand(t, repo, "tag", "-m", "tag 3", "wag", "bag")
+	addAuthorInfo(cmd, &timestamp)
+	require.NoError(t, cmd.Run(), "creating tag 3")
+
+	h, err := sizes.ScanRepositoryUsingGraph(
+		repo, git.AllReferencesFilter, sizes.NameStyleNone, false,
+	)
+	require.NoError(t, err, "scanning repository")
+	assert.Equal(t, counts.Count32(3), h.MaxTagDepth, "tag depth")
+}

git_sizer_test.go

@@ -786,9 +786,7 @@ func (r *tagRecord) initialize(g *Graph, oid git.OID, tag *git.Tag) {
 	default:
 	}
 
-	if r.pending == 0 {
-		g.finalizeTagSize(r.oid, r.size, r.objectSize)
-	}
+	r.maybeFinalize(g)
 }
 
 func (r *tagRecord) maybeFinalize(g *Graph) {

sizes/graph.go

@@ -194,9 +194,8 @@ func (l *item) levelOfConcern(t *table) (string, bool) {
 	}
 	if alert > 30 {
 		return "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", true
-	} else {
-		return stars[:int(alert)], true
 	}
+	return stars[:int(alert)], true
 }
 
 type Threshold float64