Merge branch 'dev' of github.com:gogits/gogs into dev

1 files changed, 4 insertions, 4 deletions

diff --git a/models/repo.go b/models/repo.go
index c3e9423f45..62bac9f1ef 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -305,17 +305,17 @@ func MigrateRepository(u *User, name, desc string, private, mirror bool, url str
 		return repo, errors.New("git clone: " + stderr)
 	}
 
-	// Pull data from source.
+	// Add remote and fetch data.
 	if _, stderr, err = process.ExecDir(3*time.Minute,
 		tmpDir, fmt.Sprintf("MigrateRepository(git pull): %s", repoPath),
-		"git", "pull", url); err != nil {
-		return repo, errors.New("git pull: " + stderr)
+		"git", "remote", "add", "-f", "--tags", "upstream", url); err != nil {
+		return repo, errors.New("git remote: " + stderr)
 	}
 
 	// Push data to local repository.
 	if _, stderr, err = process.ExecDir(3*time.Minute,
 		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)
 	}