aboutsummaryrefslogtreecommitdiffstats
path: root/modules/git
diff options
context:
space:
mode:
Diffstat (limited to 'modules/git')
-rw-r--r--modules/git/blob.go6
-rw-r--r--modules/git/commit.go7
-rw-r--r--modules/git/commit_info.go10
-rw-r--r--modules/git/repo.go12
-rw-r--r--modules/git/repo_branch.go7
-rw-r--r--modules/git/repo_commit.go5
-rw-r--r--modules/git/repo_compare.go8
-rw-r--r--modules/git/repo_tag.go7
-rw-r--r--modules/git/utils.go8
9 files changed, 24 insertions, 46 deletions
diff --git a/modules/git/blob.go b/modules/git/blob.go
index 171b4a1010..73ac89dfdf 100644
--- a/modules/git/blob.go
+++ b/modules/git/blob.go
@@ -50,12 +50,12 @@ func (b *Blob) GetBlobContentBase64() (string, error) {
go func() {
_, err := io.Copy(encoder, dataRc)
- encoder.Close()
+ _ = encoder.Close()
if err != nil {
- pw.CloseWithError(err)
+ _ = pw.CloseWithError(err)
} else {
- pw.Close()
+ _ = pw.Close()
}
}()
diff --git a/modules/git/commit.go b/modules/git/commit.go
index 7b64a300ab..c86ece9848 100644
--- a/modules/git/commit.go
+++ b/modules/git/commit.go
@@ -133,7 +133,7 @@ func (c *Commit) ParentCount() int {
func isImageFile(data []byte) (string, bool) {
contentType := http.DetectContentType(data)
- if strings.Index(contentType, "image/") != -1 {
+ if strings.Contains(contentType, "image/") {
return contentType, true
}
return contentType, false
@@ -206,8 +206,7 @@ func CommitChanges(repoPath string, opts CommitChangesOptions) error {
}
func commitsCount(repoPath, revision, relpath string) (int64, error) {
- var cmd *Command
- cmd = NewCommand("rev-list", "--count")
+ cmd := NewCommand("rev-list", "--count")
cmd.AddArguments(revision)
if len(relpath) > 0 {
cmd.AddArguments("--", relpath)
@@ -263,7 +262,7 @@ type SearchCommitsOptions struct {
All bool
}
-// NewSearchCommitsOptions contruct a SearchCommitsOption from a space-delimited search string
+// NewSearchCommitsOptions construct a SearchCommitsOption from a space-delimited search string
func NewSearchCommitsOptions(searchString string, forAllRefs bool) SearchCommitsOptions {
var keywords, authors, committers []string
var after, before string
diff --git a/modules/git/commit_info.go b/modules/git/commit_info.go
index da430a21cd..43723d169b 100644
--- a/modules/git/commit_info.go
+++ b/modules/git/commit_info.go
@@ -87,16 +87,6 @@ func getCommitTree(c *object.Commit, treePath string) (*object.Tree, error) {
return tree, nil
}
-func getFullPath(treePath, path string) string {
- if treePath != "" {
- if path != "" {
- return treePath + "/" + path
- }
- return treePath
- }
- return path
-}
-
func getFileHashes(c *object.Commit, treePath string, paths []string) (map[string]plumbing.Hash, error) {
tree, err := getCommitTree(c, treePath)
if err == object.ErrDirectoryNotFound {
diff --git a/modules/git/repo.go b/modules/git/repo.go
index 4be3164130..f5d7ee63bb 100644
--- a/modules/git/repo.go
+++ b/modules/git/repo.go
@@ -58,21 +58,21 @@ func (repo *Repository) parsePrettyFormatLogToList(logs []byte) (*list.List, err
// IsRepoURLAccessible checks if given repository URL is accessible.
func IsRepoURLAccessible(url string) bool {
_, err := NewCommand("ls-remote", "-q", "-h", url, "HEAD").Run()
- if err != nil {
- return false
- }
- return true
+ return err == nil
}
// InitRepository initializes a new Git repository.
func InitRepository(repoPath string, bare bool) error {
- os.MkdirAll(repoPath, os.ModePerm)
+ err := os.MkdirAll(repoPath, os.ModePerm)
+ if err != nil {
+ return err
+ }
cmd := NewCommand("init")
if bare {
cmd.AddArguments("--bare")
}
- _, err := cmd.RunInDir(repoPath)
+ _, err = cmd.RunInDir(repoPath)
return err
}
diff --git a/modules/git/repo_branch.go b/modules/git/repo_branch.go
index 116bdbee82..05eba1e30e 100644
--- a/modules/git/repo_branch.go
+++ b/modules/git/repo_branch.go
@@ -29,10 +29,7 @@ func IsBranchExist(repoPath, name string) bool {
// IsBranchExist returns true if given branch exists in current repository.
func (repo *Repository) IsBranchExist(name string) bool {
_, err := repo.gogitRepo.Reference(plumbing.ReferenceName(BranchPrefix+name), true)
- if err != nil {
- return false
- }
- return true
+ return err == nil
}
// Branch represents a Git branch.
@@ -77,7 +74,7 @@ func (repo *Repository) GetBranches() ([]string, error) {
return nil, err
}
- branches.ForEach(func(branch *plumbing.Reference) error {
+ _ = branches.ForEach(func(branch *plumbing.Reference) error {
branchNames = append(branchNames, strings.TrimPrefix(branch.Name().String(), BranchPrefix))
return nil
})
diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
index 501ea88e40..8ea2a33145 100644
--- a/modules/git/repo_commit.go
+++ b/modules/git/repo_commit.go
@@ -31,10 +31,7 @@ func (repo *Repository) GetRefCommitID(name string) (string, error) {
func (repo *Repository) IsCommitExist(name string) bool {
hash := plumbing.NewHash(name)
_, err := repo.gogitRepo.CommitObject(hash)
- if err != nil {
- return false
- }
- return true
+ return err == nil
}
// GetBranchCommitID returns last commit ID string of given branch.
diff --git a/modules/git/repo_compare.go b/modules/git/repo_compare.go
index 42f0b9ad0c..ddc8109720 100644
--- a/modules/git/repo_compare.go
+++ b/modules/git/repo_compare.go
@@ -13,6 +13,8 @@ import (
"strconv"
"strings"
"time"
+
+ logger "code.gitea.io/gitea/modules/log"
)
// CompareInfo represents needed information for comparing references.
@@ -55,7 +57,11 @@ func (repo *Repository) GetCompareInfo(basePath, baseBranch, headBranch string)
if err = repo.AddRemote(tmpRemote, basePath, true); err != nil {
return nil, fmt.Errorf("AddRemote: %v", err)
}
- defer repo.RemoveRemote(tmpRemote)
+ defer func() {
+ if err := repo.RemoveRemote(tmpRemote); err != nil {
+ logger.Error("GetPullRequestInfo: RemoveRemote: %v", err)
+ }
+ }()
}
compareInfo := new(CompareInfo)
diff --git a/modules/git/repo_tag.go b/modules/git/repo_tag.go
index 08d66262c1..df49e9acd6 100644
--- a/modules/git/repo_tag.go
+++ b/modules/git/repo_tag.go
@@ -24,10 +24,7 @@ func IsTagExist(repoPath, name string) bool {
// IsTagExist returns true if given tag exists in the repository.
func (repo *Repository) IsTagExist(name string) bool {
_, err := repo.gogitRepo.Reference(plumbing.ReferenceName(TagPrefix+name), true)
- if err != nil {
- return false
- }
- return true
+ return err == nil
}
// CreateTag create one tag in the repository
@@ -221,7 +218,7 @@ func (repo *Repository) GetTags() ([]string, error) {
return nil, err
}
- tags.ForEach(func(tag *plumbing.Reference) error {
+ _ = tags.ForEach(func(tag *plumbing.Reference) error {
tagNames = append(tagNames, strings.TrimPrefix(tag.Name().String(), TagPrefix))
return nil
})
diff --git a/modules/git/utils.go b/modules/git/utils.go
index 8f010321cf..83cd21f34e 100644
--- a/modules/git/utils.go
+++ b/modules/git/utils.go
@@ -7,7 +7,6 @@ package git
import (
"fmt"
"os"
- "path/filepath"
"strings"
"sync"
)
@@ -75,13 +74,6 @@ func concatenateError(err error, stderr string) error {
return fmt.Errorf("%v - %s", err, stderr)
}
-// If the object is stored in its own file (i.e not in a pack file),
-// this function returns the full path to the object file.
-// It does not test if the file exists.
-func filepathFromSHA1(rootdir, sha1 string) string {
- return filepath.Join(rootdir, "objects", sha1[:2], sha1[2:])
-}
-
// RefEndName return the end name of a ref name
func RefEndName(refStr string) string {
if strings.HasPrefix(refStr, BranchPrefix) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 05:54:54 +0000