diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-11-24 11:58:05 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-11-28 17:01:38 +0000 |
| commit | 3c6a4d63636ba41dad0ce63cf536761fc3b5ef64 (patch) | |
| tree | 9fafbe59d20f94c22e27dd35a8ddd1297ca6a54b /spec/lib/gitlab/diff/position_tracer_spec.rb | |
| parent | 7c1e54d58d7ee0308b865d9563f1dfeb54568e16 (diff) | |
| download | gitlab-ce-3c6a4d63636ba41dad0ce63cf536761fc3b5ef64.tar.gz | |
Ensure MRs always use branch refs for comparison
If a merge request was created with a branch name that also matched a tag name,
we'd generate a comparison to or from the tag respectively, rather than the
branch. Merging would still use the branch, of course.
To avoid this, ensure that when we get the branch heads, we prepend the
reference prefix for branches, which will ensure that we generate the correct
comparison.
Diffstat (limited to 'spec/lib/gitlab/diff/position_tracer_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/diff/position_tracer_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/diff/position_tracer_spec.rb b/spec/lib/gitlab/diff/position_tracer_spec.rb index e5138705443..ddc4f6c5b5c 100644 --- a/spec/lib/gitlab/diff/position_tracer_spec.rb +++ b/spec/lib/gitlab/diff/position_tracer_spec.rb @@ -1771,9 +1771,9 @@ describe Gitlab::Diff::PositionTracer do describe "merge of target branch" do let(:merge_commit) do - update_file_again_commit + second_create_file_commit - merge_request = create(:merge_request, source_branch: second_create_file_commit.sha, target_branch: branch_name, source_project: project) + merge_request = create(:merge_request, source_branch: second_branch_name, target_branch: branch_name, source_project: project) repository.merge(current_user, merge_request.diff_head_sha, merge_request, "Merge branches") |