analytics: fix git remote reporting (#1145)

internal/cli/analytics.go

@@ -84,7 +84,7 @@ func globalTags() map[string]string {
 	}
 
 	// store a hash of the git remote to help us guess how many users are running it on the same repository
-	origin := normalizeGitRemote(gitOrigin())
+	origin := normalizeGitRemote(gitOrigin("."))
 	if origin != "" {
 		h := md5.Sum([]byte(origin))
 		ret["git.origin"] = base64.StdEncoding.EncodeToString(h[:])
@@ -93,14 +93,14 @@ func globalTags() map[string]string {
 	return ret
 }
 
-func gitOrigin() string {
-	cmd := exec.Command("git", "remote", "get", "origin")
+func gitOrigin(fromDir string) string {
+	cmd := exec.Command("git", "-C", fromDir, "remote", "get-url", "origin")
 	b, err := cmd.Output()
 	if err != nil {
 		return ""
 	}
 
-	return string(b)
+	return strings.TrimRight(string(b), "\n")
 }
 
 func normalizeGitRemote(s string) string {

internal/cli/analytics_test.go

@@ -1,8 +1,11 @@
 package cli
 
 import (
+	"os/exec"
 	"testing"
 
+	"github.com/windmilleng/tilt/internal/testutils/tempdir"
+
 	"github.com/stretchr/testify/assert"
 )
 
@@ -21,3 +24,22 @@ func TestNormalizeGitRemoteTrailingSlash(t *testing.T) {
 func TestNormalizedGitRemoteUsername(t *testing.T) {
 	assert.Equal(t, normalizeGitRemote("https://github.com/windmilleng/tilt"), normalizeGitRemote("[email protected]:windmilleng/tilt.git"))
 }
+
+func TestGitOrigin(t *testing.T) {
+	tf := tempdir.NewTempDirFixture(t)
+	defer tf.TearDown()
+
+	err := exec.Command("git", "init", tf.Path()).Run()
+	if err != nil {
+		t.Fatalf("failed to init git repo: %+v", err)
+	}
+	err = exec.Command("git", "-C", tf.Path(), "remote", "add", "origin", "https://github.com/windmilleng/tilt").Run()
+	if err != nil {
+		t.Fatalf("failed to set origin's url: %+v", err)
+	}
+	origin := gitOrigin(tf.Path())
+
+	// we can't just compare raw urls because of https://git-scm.com/docs/git-config#git-config-urlltbasegtinsteadOf
+	// e.g., circleci images set `url.ssh://[email protected]=https://github.com`
+	assert.Equal(t, "//github.com/windmilleng/tilt", normalizeGitRemote(origin))
+}