diff options
| author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-09-27 06:07:31 +0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-10-28 19:53:18 +0300 |
| commit | fa3bbd449efb69a42a2347c3c3fa08cd822c2471 (patch) | |
| tree | cee7557e3a83dd18fb8f6162b9e7333f391e0ce4 /spec/finders/branches_finder_spec.rb | |
| parent | 5742f4a6287927972790d9f20d671c505f149856 (diff) | |
Fix lightweight tags not processed correctly by GitTagPushService
When we updated gitlab_git to 10.4.1, `tag.target` changed from pointing
to the sha of the tag to the sha of the commit the tag points to. The
problem is that only annotated tags have `object_sha`s, lightweight tags
don't (it's nil), so (only) in their case we still need to use
`tag.target`.
Diffstat (limited to 'spec/finders/branches_finder_spec.rb')
| -rw-r--r-- | spec/finders/branches_finder_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/finders/branches_finder_spec.rb b/spec/finders/branches_finder_spec.rb index 6fce11de30f..db60c01db0d 100644 --- a/spec/finders/branches_finder_spec.rb +++ b/spec/finders/branches_finder_spec.rb @@ -21,7 +21,7 @@ describe BranchesFinder do result = branches_finder.execute recently_updated_branch = repository.branches.max do |a, b| - repository.commit(a.target).committed_date <=> repository.commit(b.target).committed_date + repository.commit(a.dereferenced_target).committed_date <=> repository.commit(b.dereferenced_target).committed_date end expect(result.first.name).to eq(recently_updated_branch.name) |