Skip to content

improve code quality #21462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed

improve code quality #21462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
70bd54a
improve code quality
6543 Oct 14, 2022
dff2138
make searchCommits more explicite
6543 Oct 14, 2022
721e081
reorder stuff
6543 Oct 14, 2022
38a6318
some more trimming
6543 Oct 14, 2022
269ba73
nit
6543 Oct 15, 2022
f5d5a3d
cmd-args-respect-args
6543 Oct 15, 2022
2a5cd78
Merge branch 'main' into some-nit
6543 Oct 15, 2022
3d647a5
Update modules/git/repo_commit.go
6543 Oct 15, 2022
2e39d02
Update modules/git/repo_commit.go
6543 Oct 15, 2022
d528d66
rm
6543 Oct 15, 2022
f21180e
bump git requirement to 2.24
6543 Oct 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions modules/git/git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
)

// RequiredVersion is the minimum Git version required
const RequiredVersion = "2.0.0"
const RequiredVersion = "2.24.0"

var (
// GitExecutable is the command name of git
Expand Down Expand Up @@ -116,8 +116,7 @@ func VersionInfo() string {
}
format := "%s"
args := []interface{}{gitVersion.Original()}
// Since git wire protocol has been released from git v2.18
if setting.Git.EnableAutoGitWireProtocol && CheckGitVersionAtLeast("2.18") == nil {
if setting.Git.EnableAutoGitWireProtocol {
format += ", Wire Protocol %s Enabled"
args = append(args, "Version 2") // for focus color
}
Expand Down
8 changes: 5 additions & 3 deletions modules/git/repo_commit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func (repo *Repository) searchCommits(id SHA1, opts SearchCommitsOptions) ([]*Co
// add previous arguments except for --grep and --all
hashCmd.AddArguments(args...)
// add keyword as <commit>
hashCmd.AddArguments(v)
hashCmd.AddArguments("--end-of-options", v)

// search with given constraints for commit matching sha hash of v
hashMatching, _, err := hashCmd.RunStdBytes(&RunOpts{Dir: repo.Path})
Expand Down Expand Up @@ -211,9 +211,11 @@ func (repo *Repository) CommitsByFileAndRange(revision, file string, page int) (
}()
go func() {
stderr := strings.Builder{}
err := NewCommand(repo.Ctx, "rev-list", revision,
err := NewCommand(repo.Ctx, "rev-list",
"--max-count="+strconv.Itoa(setting.Git.CommitsRangeSize*page),
"--skip="+strconv.Itoa(skip), "--", file).
"--skip="+strconv.Itoa(skip),
"--end-of-options", revision,
"--", file).
Run(&RunOpts{
Dir: repo.Path,
Stdout: stdoutWriter,
Expand Down
2 changes: 1 addition & 1 deletion modules/git/repo_stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func (repo *Repository) GetCodeActivityStats(fromTime time.Time, branch string)
if len(branch) == 0 {
args = append(args, "--branches=*")
} else {
args = append(args, "--first-parent", branch)
args = append(args, "--first-parent", "--", branch)
}

stderr := new(strings.Builder)
Expand Down