tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-09 03:57:19 +00:00
Code Releases Activity

Fix loadOneBranch panic (#29938) (#29939)

Browse Source 
Backport #29938

Try to fix #29936

Far from ideal, but still better than panic.
This commit is contained in:
wxiaoguang
2024-03-20 22:31:32 +08:00
committed by GitHub
parent 3fd15aeff2
commit b4a6c6fd7a
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/git/repo.go
View File

@ -248,7 +248,7 @@ type DivergeObject struct {
// GetDivergingCommits returns the number of commits a targetBranch is ahead or behind a baseBranch
func GetDivergingCommits(ctx context.Context, repoPath, baseBranch, targetBranch string) (do DivergeObject, err error) {
cmd := NewCommand(ctx, "rev-list", "--count", "--left-right").
AddDynamicArguments(baseBranch + "..." + targetBranch)
AddDynamicArguments(baseBranch + "..." + targetBranch).AddArguments("--")
stdout, _, err := cmd.RunStdString(&RunOpts{Dir: repoPath})
if err != nil {
return do, err