diff options
| author | Unknwon <u@gogs.io> | 2015-03-20 01:58:28 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-03-20 01:58:28 -0400 |
| commit | 62e436e6b7a41bac2e17a26f08649c144cef5b57 (patch) | |
| tree | 379be1b74989d5be2aacc68753b0d3d12597d400 /models/migrations/migrations.go | |
| parent | 4b9fb43a708d0aaaf710a060f7b2dd0b7ad959d0 (diff) | |
| parent | e312634286e68d8fac4d20adb729661f8a444b2a (diff) | |
Merge branch 'develop' of github.com:gogits/gogs into release/0.6.1
Diffstat (limited to 'models/migrations/migrations.go')
| -rw-r--r-- | models/migrations/migrations.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 8d2d5b40..4b5f5a69 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -341,12 +341,15 @@ func teamToTeamRepo(x *xorm.Engine) error { orgID := com.StrTo(team["org_id"]).MustInt64() teamID := com.StrTo(team["id"]).MustInt64() + // #1032: legacy code can have duplicated IDs for same repository. + mark := make(map[int64]bool) for _, idStr := range strings.Split(string(team["repo_ids"]), "|") { repoID := com.StrTo(strings.TrimPrefix(idStr, "$")).MustInt64() - if repoID == 0 { + if repoID == 0 || mark[repoID] { continue } + mark[repoID] = true teamRepos = append(teamRepos, &TeamRepo{ OrgID: orgID, TeamID: teamID, |