nits to improve git backend (thomiceli#7)

jiriks74 · Apr 16, 2023 · 2e5e763 · 2e5e763
1 parent f297f26
commit 2e5e763
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/internal/git/commands.go b/internal/git/commands.go
@@ -7,6 +7,7 @@ import (
  "os/exec"
  "path"
  "path/filepath"
+ "strconv"
  "strings"
 )
 
@@ -62,8 +63,9 @@ func GetFilesOfRepository(user string, gist string, revision string) ([]string,
  cmd := exec.Command(
  "git",
  "ls-tree",
- revision,
  "--name-only",
+ "--",
+ revision,
  )
  cmd.Dir = repositoryPath
 
@@ -101,7 +103,7 @@ func GetFileContent(user string, gist string, revision string, filename string,
  return truncateCommandOutput(stdout, maxBytes)
 }
 
-func GetLog(user string, gist string, skip string) ([]*Commit, error) {
+func GetLog(user string, gist string, skip int) ([]*Commit, error) {
  repositoryPath := RepositoryPath(user, gist)
 
  cmd := exec.Command(
@@ -113,7 +115,7 @@ func GetLog(user string, gist string, skip string) ([]*Commit, error) {
  "--no-color",
  "-p",
  "--skip",
- skip,
+ strconv.Itoa(skip),
  "--format=format:c %H%na %aN%nm %ae%nt %at",
  "--shortstat",
  "HEAD",

diff --git a/internal/models/gist.go b/internal/models/gist.go
@@ -228,7 +228,7 @@ func (gist *Gist) File(revision string, filename string, truncate bool) (*git.Fi
  }, err
 }
 
-func (gist *Gist) Log(skip string) ([]*git.Commit, error) {
+func (gist *Gist) Log(skip int) ([]*git.Commit, error) {
  return git.GetLog(gist.User.Username, gist.Uuid, skip)
 }
 

diff --git a/internal/web/gist.go b/internal/web/gist.go
@@ -178,7 +178,7 @@ func revisions(ctx echo.Context) error {
 
  pageInt := getPage(ctx)
 
- commits, err := gist.Log(strconv.Itoa((pageInt - 1) * 10))
+ commits, err := gist.Log((pageInt - 1) * 10)
  if err != nil {
  return errorRes(500, "Error fetching commits log", err)
  }