diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-11-24 14:58:05 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-11-28 20:01:38 +0300 |
| commit | 3c6a4d63636ba41dad0ce63cf536761fc3b5ef64 (patch) | |
| tree | 9fafbe59d20f94c22e27dd35a8ddd1297ca6a54b /changelogs | |
| parent | 7c1e54d58d7ee0308b865d9563f1dfeb54568e16 (diff) | |
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 'changelogs')
| -rw-r--r-- | changelogs/unreleased/40530-merge-request-generates-wrong-diff-when-branch-and-tag-have-the-same-name.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/40530-merge-request-generates-wrong-diff-when-branch-and-tag-have-the-same-name.yml b/changelogs/unreleased/40530-merge-request-generates-wrong-diff-when-branch-and-tag-have-the-same-name.yml new file mode 100644 index 00000000000..e9fae6fe0d7 --- /dev/null +++ b/changelogs/unreleased/40530-merge-request-generates-wrong-diff-when-branch-and-tag-have-the-same-name.yml @@ -0,0 +1,5 @@ +--- +title: Fix merge requests where the source or target branch name matches a tag name +merge_request: 15591 +author: +type: fixed |