tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-08-05 09:08:22 +00:00
Code Releases Activity

Restore functionality for early gits (#7775) (#8476)

Browse Source 
* Change tests to make it possible to run TestGit with 1.7.2

* Make merge run on 1.7.2

* Fix tracking and staging branch name problem

* Ensure that git 1.7.2 works on tests

* ensure that there is no chance for conflicts

* Fix-up missing merge issues

* Final rm

* Ensure LFS filters run on the tests

* Do not sign commits from temp repo

* Apply suggestions from code review

* Update modules/repofiles/temp_repo.go
This commit is contained in:
zeripath
2019-10-13 05:40:13 +01:00
committed by Lunny Xiao
parent 80b50afe1f
commit 5c3863c319
12 changed files with 223 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
models/repo.go
View File

@@ -1063,7 +1063,7 @@ func CleanUpMigrateInfo(repo *Repository) (*Repository, error) {
}
}
_, err := git.NewCommand("remote", "remove", "origin").RunInDir(repoPath)
_, err := git.NewCommand("remote", "rm", "origin").RunInDir(repoPath)
if err != nil && !strings.HasPrefix(err.Error(), "exit status 128 - fatal: No such remote ") {
return repo, fmt.Errorf("CleanUpMigrateInfo: %v", err)
}

2
models/repo_mirror.go
View File

@@ -134,7 +134,7 @@ func (m *Mirror) FullAddress() string {
func (m *Mirror) SaveAddress(addr string) error {
repoPath := m.Repo.RepoPath()
// Remove old origin
_, err := git.NewCommand("remote", "remove", "origin").RunInDir(repoPath)
_, err := git.NewCommand("remote", "rm", "origin").RunInDir(repoPath)
if err != nil && !strings.HasPrefix(err.Error(), "exit status 128 - fatal: No such remote ") {
return err
}