diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2016-12-31 17:34:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-31 17:34:34 +0800 |
| commit | 6e5fffbd3f5414ead3f617f6f07c597ee6cfdf06 (patch) | |
| tree | f0cfcc9fea0005764807071aee051b1f7692c8c8 /models | |
| parent | de8b73dd9241375d78a08bb01910d2c820b5e481 (diff) | |
| download | gitea-6e5fffbd3f5414ead3f617f6f07c597ee6cfdf06.tar.gz gitea-6e5fffbd3f5414ead3f617f6f07c597ee6cfdf06.zip | |
resolved #485: when migrate empty wiki repo, then ignore (#541)
Diffstat (limited to 'models')
| -rw-r--r-- | models/repo.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/models/repo.go b/models/repo.go index ce9740f8c4..b4f4935803 100644 --- a/models/repo.go +++ b/models/repo.go @@ -691,7 +691,6 @@ func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) { wikiRemotePath := wikiRemoteURL(opts.RemoteAddr) if len(wikiRemotePath) > 0 { - if err := os.RemoveAll(wikiPath); err != nil { 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, Quiet: true, Timeout: migrateTimeout, + Branch: "master", }); 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) + } } } |