linden123/githaven-fork
1
1
Fork 0
forked from Shiloh/githaven
Code Pull Requests Activity

Mirror: Update DB on Address-Update too (#12964)

Browse Source 
* Mirror: Update DB on Address-Update too

* new name for function to better describe
This commit is contained in:
6543 2020-09-28 21:00:52 +02:00 committed by GitHub
parent 14e718695a
commit 4a654a8d44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
routers/repo/setting.go
View File

@ -202,8 +202,8 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {
address = u.String() address = u.String()
if err := mirror_service.SaveAddress(ctx.Repo.Mirror, address); err != nil { if err := mirror_service.UpdateAddress(ctx.Repo.Mirror, address); err != nil {
ctx.ServerError("SaveAddress", err) ctx.ServerError("UpdateAddress", err)
return return
} }

8
services/mirror/mirror.go
View File

@ -89,8 +89,8 @@ func AddressNoCredentials(m *models.Mirror) string {
return u.String() return u.String()
} }
// SaveAddress writes new address to Git repository config. // UpdateAddress writes new address to Git repository and database
func SaveAddress(m *models.Mirror, addr string) error { func UpdateAddress(m *models.Mirror, addr string) error {
repoPath := m.Repo.RepoPath() repoPath := m.Repo.RepoPath()
// Remove old origin // Remove old origin
_, err := git.NewCommand("remote", "rm", "origin").RunInDir(repoPath) _, err := git.NewCommand("remote", "rm", "origin").RunInDir(repoPath)
@ -117,7 +117,9 @@ func SaveAddress(m *models.Mirror, addr string) error {
return err return err
} }
} }
return nil
m.Repo.OriginalURL = addr
return models.UpdateRepositoryCols(m.Repo, "original_url")
} }
// gitShortEmptySha Git short empty SHA // gitShortEmptySha Git short empty SHA