]> Sergey Matveev's repositories - sgblog.git/commitdiff
Do not shadow log module
authorSergey Matveev <stargrave@stargrave.org>
Sat, 14 Mar 2020 10:15:41 +0000 (13:15 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Sat, 14 Mar 2020 10:15:41 +0000 (13:15 +0300)
cmd/sgblog/main.go

index 9162a88b0ffb830c468d8886830a69de9c06b7dc..df9e0750269797a8c06b93b0063ec166a1dfddfd 100644 (file)
@@ -348,13 +348,13 @@ func main() {
                                makeErr(err)
                        }
                }
-               log, err := repo.Log(&git.LogOptions{From: head.Hash()})
+               repoLog, err := repo.Log(&git.LogOptions{From: *headHash})
                if err != nil {
                        makeErr(err)
                }
                commentN := 0
                for i := 0; i < offset; i++ {
-                       if _, err = log.Next(); err != nil {
+                       if _, err = repoLog.Next(); err != nil {
                                break
                        }
                        commentN++
@@ -367,7 +367,7 @@ func main() {
                }
                etagHash.Write([]byte("INDEX"))
                for i := 0; i < PageEntries; i++ {
-                       commit, err := log.Next()
+                       commit, err := repoLog.Next()
                        if err != nil {
                                logEnded = true
                                break
@@ -468,12 +468,12 @@ func main() {
                        }},
                        Author: &atom.Person{Name: cfg.AtomAuthor},
                }
-               log, err := repo.Log(&git.LogOptions{From: head.Hash()})
+               repoLog, err := repo.Log(&git.LogOptions{From: *headHash})
                if err != nil {
                        makeErr(err)
                }
                for i := 0; i < PageEntries; i++ {
-                       commit, err = log.Next()
+                       commit, err = repoLog.Next()
                        if err != nil {
                                break
                        }