Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mirror: Delete tags in mirror which are removed for original repo. #5609

Merged
merged 2 commits into from
Dec 31, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
mirror: Delete tags in mirror which are removed for original repo.
This bug was being caused by an error in the logic in `release.go`.
Credit to @yasuokav for tracing the root of the issue.

Fixes: #5192.
  • Loading branch information
HarshitOnGitHub committed Dec 30, 2018
commit be0998484d8185f518cbda0f3c2e40ebdee19bc0
4 changes: 2 additions & 2 deletions models/release.go
Original file line number Diff line number Diff line change
Expand Up @@ -479,10 +479,10 @@ func SyncReleasesWithTags(repo *Repository, gitRepo *git.Repository) error {
continue
}
commitID, err := gitRepo.GetTagCommitID(rel.TagName)
if err != nil {
if err != nil && !git.IsErrNotExist(err) {
return fmt.Errorf("GetTagCommitID: %v", err)
}
if !gitRepo.IsTagExist(rel.TagName) || commitID != rel.Sha1 {
if git.IsErrNotExist(err) || commitID != rel.Sha1 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two condition are different. If git.IsErrNotExist(err), it should be delted. But for commitID != rel.Sha, the tag should be retag but not delete.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two condition are different. If git.IsErrNotExist(err), it should be delted. But for commitID != rel.Sha, the tag should be retag but not delete.

if err := pushUpdateDeleteTag(repo, gitRepo, rel.TagName); err != nil {
return fmt.Errorf("pushUpdateDeleteTag: %v", err)
}
Expand Down
55 changes: 55 additions & 0 deletions models/release_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,58 @@ func TestRelease_Create(t *testing.T) {
IsTag: true,
}, nil))
}

func TestRelease_MirrorDelete(t *testing.T) {
assert.NoError(t, PrepareTestDatabase())

user := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User)
repo := AssertExistsAndLoadBean(t, &Repository{ID: 1}).(*Repository)
repoPath := RepoPath(user.Name, repo.Name)
migrationOptions := MigrateRepoOptions{
Name: "test_mirror",
Description: "Test mirror",
IsPrivate: false,
IsMirror: true,
RemoteAddr: repoPath,
}
mirror, err := MigrateRepository(user, user, migrationOptions)
assert.NoError(t, err)

gitRepo, err := git.OpenRepository(repoPath)
assert.NoError(t, err)

findOptions := FindReleasesOptions{IncludeDrafts: true, IncludeTags: true}
initCount, err := GetReleaseCountByRepoID(mirror.ID, findOptions)
assert.NoError(t, err)

assert.NoError(t, CreateRelease(gitRepo, &Release{
RepoID: repo.ID,
PublisherID: user.ID,
TagName: "v0.2",
Target: "master",
Title: "v0.2 is released",
Note: "v0.2 is released",
IsDraft: false,
IsPrerelease: false,
IsTag: true,
}, nil))

err = mirror.GetMirror()
assert.NoError(t, err)

_, ok := mirror.Mirror.runSync()
assert.True(t, ok)

count, err := GetReleaseCountByRepoID(mirror.ID, findOptions)
assert.EqualValues(t, initCount+1, count)

release, err := GetRelease(repo.ID, "v0.2")
assert.NoError(t, err)
assert.NoError(t, DeleteReleaseByID(release.ID, user, true))

_, ok = mirror.Mirror.runSync()
assert.True(t, ok)

count, err = GetReleaseCountByRepoID(mirror.ID, findOptions)
assert.EqualValues(t, initCount, count)
}