From: Sergey Matveev <stargrave@stargrave.org>
Date: Sat, 14 Mar 2020 10:15:41 +0000 (+0300)
Subject: Do not shadow log module
X-Git-Tag: v0.4.0~8
X-Git-Url: http://www.git.stargrave.org/?p=sgblog.git;a=commitdiff_plain;h=5567eb06f1cb5d44965ca01a7b1c09d9b464e556

Do not shadow log module
---

diff --git a/cmd/sgblog/main.go b/cmd/sgblog/main.go
index 9162a88..df9e075 100644
--- a/cmd/sgblog/main.go
+++ b/cmd/sgblog/main.go
@@ -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
 			}