stonewareslord/gogs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #371 from m0sth8/bufix_migrate_all_branches

Browse Source 
Migrate all branches and tags
This commit is contained in:
无闻 2014-08-25 19:38:41 -07:00
commit 66c9c86219
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
models/repo.go
View File

@ -305,17 +305,17 @@ func MigrateRepository(u *User, name, desc string, private, mirror bool, url str
return repo, errors.New("git clone: " + stderr) return repo, errors.New("git clone: " + stderr)
} }
// Pull data from source. // Add remote and fetch data.
if _, stderr, err = process.ExecDir(3*time.Minute, if _, stderr, err = process.ExecDir(3*time.Minute,
tmpDir, fmt.Sprintf("MigrateRepository(git pull): %s", repoPath), tmpDir, fmt.Sprintf("MigrateRepository(git pull): %s", repoPath),
"git", "pull", url); err != nil { "git", "remote", "add", "-f", "--tags", "upstream", url); err != nil {
return repo, errors.New("git pull: " + stderr) return repo, errors.New("git remote: " + stderr)
} }
// Push data to local repository. // Push data to local repository.
if _, stderr, err = process.ExecDir(3*time.Minute, if _, stderr, err = process.ExecDir(3*time.Minute,
tmpDir, fmt.Sprintf("MigrateRepository(git push): %s", repoPath), tmpDir, fmt.Sprintf("MigrateRepository(git push): %s", repoPath),
"git", "push", "origin", "master"); err != nil { "git", "push", "--tags", "origin", "refs/remotes/upstream/*:refs/heads/*"); err != nil {
return repo, errors.New("git push: " + stderr) return repo, errors.New("git push: " + stderr)
} }