From 5567eb06f1cb5d44965ca01a7b1c09d9b464e556 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Sat, 14 Mar 2020 13:15:41 +0300 Subject: [PATCH] Do not shadow log module --- cmd/sgblog/main.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 } -- 2.44.0