fixo

4 files changed, 13 insertions, 9 deletions

diff --git a/filter.go b/filter.go
index d52b191..ea6a89e 100644
--- a/filter.go
+++ b/filter.go
@@ -82,6 +82,9 @@ func (f *Filter) pkgbuild2srcinfo(pkgbuildId string) (string, error) {
 
 		// Read the PKGBUILD
 		sha1, data, err := f.backend.CatBlob(libfastimport.CmdCatBlob{DataRef: pkgbuildId})
+		if err != nil {
+			return "", err
+		}
 		if sha1 != pkgbuildId {
 			return "", fmt.Errorf("PKGBUILD sha1 mismatch: %q != %q", pkgbuildId, sha1)
 		}
diff --git a/git.go b/git.go
index d43c05d..c6509ff 100644
--- a/git.go
+++ b/git.go
@@ -92,13 +92,14 @@ func gitRefs() (map[string]string, error) {
 		if line == "" {
 			continue
 		}
-		fields := strings.SplitN(line, " ", 3)
-		if len(fields) != 3 {
+		sp := strings.IndexByte(line, ' ')
+		ht := strings.IndexByte(line, '\t')
+		if sp < 0 || ht < sp {
 			return nil, fmt.Errorf("malformed git for-each-ref line: %q", line)
 		}
-		refTarget := fields[0]
-		refType := fields[1]
-		refName := fields[2]
+		refTarget := line[:sp]
+		refType := line[sp+1 : ht]
+		refName := line[ht+1:]
 		if refType != "commit" {
 			continue
 		}
diff --git a/heuristics.go b/heuristics.go
index 9fc44e5..4047e25 100644
--- a/heuristics.go
+++ b/heuristics.go
@@ -30,6 +30,7 @@ func filename2branchname(filename string) string {
 	}
 	// This blackliast assumes that no package named one of those
 	// strings will ever exist.
+loop:
 	for {
 		switch path.Base(branchname) {
 		case "log", "src": // packages.git
@@ -39,7 +40,7 @@ func filename2branchname(filename string) string {
 		case "repos":
 			return ""
 		default:
-			break
+			break loop
 		}
 	}
 	// A branch must contain a "/"
diff --git a/main.go b/main.go
index 28e6d2c..f50704b 100644
--- a/main.go
+++ b/main.go
@@ -15,7 +15,7 @@ func fmtDuration(d time.Duration) string {
 	d -= m * time.Minute
 	s := d / time.Second
 
-	return fmt.Sprintf("%02d:%02d:%02", h, m, s)
+	return fmt.Sprintf("%02d:%02d:%02d", h, m, s)
 }
 
 func usage(w io.Writer) {
@@ -49,7 +49,7 @@ func main() {
 	maxline := 0
 	status := func() {
 		duration := time.Since(beg)
-		line := fmt.Sprintf("[%s] commits (%.2f commit/s)",
+		line := fmt.Sprintf("[%s] %d commits (%.2f commit/s)",
 			fmtDuration(duration),
 			commits,
 			float64(commits)/duration.Seconds())
@@ -71,7 +71,6 @@ func main() {
 	}
 
 	err = filter.Run()
-	status()
 	fmt.Fprintln(os.Stderr)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "Error:", err)