pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix empty checkout bug (#3419)

Browse source
This commit is contained in:
Ethan Koenig 2018-01-28 04:27:42 -07:00 committed by Lauris BH
parent 36a94da8da
commit c55a027da3
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
models/repo.go
View file

@ -774,17 +774,17 @@ func UpdateLocalCopyBranch(repoPath, localPath, branch string) error {
return fmt.Errorf("git clone %s: %v", branch, err) return fmt.Errorf("git clone %s: %v", branch, err)
} }
} else { } else {
_, err := git.NewCommand("fetch", "origin").RunInDir(localPath)
if err != nil {
return fmt.Errorf("git fetch origin: %v", err)
}
if len(branch) > 0 {
if err := git.Checkout(localPath, git.CheckoutOptions{ if err := git.Checkout(localPath, git.CheckoutOptions{
Branch: branch, Branch: branch,
}); err != nil { }); err != nil {
return fmt.Errorf("git checkout %s: %v", branch, err) return fmt.Errorf("git checkout %s: %v", branch, err)
} }
_, err := git.NewCommand("fetch", "origin").RunInDir(localPath)
if err != nil {
return fmt.Errorf("git fetch origin: %v", err)
}
if len(branch) > 0 {
if err := git.ResetHEAD(localPath, true, "origin/"+branch); err != nil { if err := git.ResetHEAD(localPath, true, "origin/"+branch); err != nil {
return fmt.Errorf("git reset --hard origin/%s: %v", branch, err) return fmt.Errorf("git reset --hard origin/%s: %v", branch, err)
} }