Lunny Xiao
GitHub
9 years ago
1 changed files with 5 additions and 2 deletions
Unified View
Diff Options
-
+5 -2models/repo.go
+ 5
- 2
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) | |||||
| } | |||||
| } | } | ||||
| } | } | ||||