tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

Fix errors caused by force push (#1927)

Browse source
This commit is contained in:
Ethan Koenig 2017-06-10 22:59:13 -04:00 committed by Bo-Yi Wu
parent 96b4780727
commit e0a63a20e0
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
models/repo.go
View file

@ -700,12 +700,13 @@ func UpdateLocalCopyBranch(repoPath, localPath, branch string) error {
}); err != nil { }); err != nil {
return fmt.Errorf("git checkout %s: %v", branch, err) return fmt.Errorf("git checkout %s: %v", branch, err)
} }
if err := git.Pull(localPath, git.PullRemoteOptions{
Timeout: time.Duration(setting.Git.Timeout.Pull) * time.Second, _, err := git.NewCommand("fetch", "origin").RunInDir(localPath)
Remote: "origin", if err != nil {
Branch: branch, return fmt.Errorf("git fetch origin: %v", err)
}); err != nil { }
return fmt.Errorf("git pull origin %s: %v", branch, err) if err := git.ResetHEAD(localPath, true, "origin/"+branch); err != nil {
return fmt.Errorf("git reset --hard origin/%s: %v", branch, err)
} }
} }
return nil return nil