peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolved #485: when migrate empty wiki repo, then ignore (#544)

Browse Source
This commit is contained in:
Lunny Xiao 2016-12-31 18:36:41 +08:00 committed by GitHub
parent fbb424c61d
commit 10d73d38e0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
models/repo.go
View File

@ -691,7 +691,6 @@ func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) {
wikiRemotePath := wikiRemoteURL(opts.RemoteAddr) wikiRemotePath := wikiRemoteURL(opts.RemoteAddr)
if len(wikiRemotePath) > 0 { if len(wikiRemotePath) > 0 {
if err := os.RemoveAll(wikiPath); err != nil { if err := os.RemoveAll(wikiPath); err != nil {
return repo, fmt.Errorf("Fail to remove %s: %v", wikiPath, err) return repo, fmt.Errorf("Fail to remove %s: %v", wikiPath, err)
} }
@ -700,8 +699,12 @@ func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) {
Mirror: true, Mirror: true,
Quiet: true, Quiet: true,
Timeout: migrateTimeout, Timeout: migrateTimeout,
Branch: "master",
}); err != nil { }); err != nil {
log.Info("Clone wiki: %v", err) log.Warn("Clone wiki: %v", err)
if err := os.RemoveAll(wikiPath); err != nil {
return repo, fmt.Errorf("Fail to remove %s: %v", wikiPath, err)
}
} }
} }