Skip to content
This repository has been archived by the owner on Nov 22, 2022. It is now read-only.

fix(mr): Use default branch on mr create #630

Merged
merged 2 commits into from
Feb 28, 2021

Conversation

zemzale
Copy link
Collaborator

@zemzale zemzale commented Feb 24, 2021

Description
When branch is pushed to remote, the target branch came out to be the
remote traking branch, which would become target == source. That can't
work so this needs to be removed.

Related Issue

Resolves #619

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation
  • Chore (Related to CI or Packaging to platforms)

When branch is pushed to remote, the target branch came out to be the
remote traking branch, which would become target == source. That can't
work so this needs to be removed.

Resolves !619
@profclems profclems changed the title fix(mr): Use default branch on mr craete fix(mr): Use default branch on mr create Feb 24, 2021
@zemzale
Copy link
Collaborator Author

zemzale commented Feb 25, 2021

@profclems Any idea why the test is failing?

Also, any idea how I can run them normally locally since I get output like this

 Error:          "\nCreating merge request for \x1b[0;36mfeat-new-mr\x1b[0m into \x1b[0;36mmaster\x1b[0m in OWNER/REPO\n\n" does not contain "\nCreating merge request for feat-new-mr into master in OWNER/REPO\n\n"

which does seem to be because of some escape codes, for the color output

@profclems profclems added cmd: mr Issue is related to merge request management Fix This fixes a bug or incorrect documentation labels Feb 28, 2021
@codecov
Copy link

codecov bot commented Feb 28, 2021

Codecov Report

Merging #630 (fafcdfe) into trunk (054831b) will increase coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##            trunk     #630      +/-   ##
==========================================
+ Coverage   60.51%   60.54%   +0.03%     
==========================================
  Files          90       90              
  Lines        6357     6352       -5     
==========================================
- Hits         3847     3846       -1     
+ Misses       2148     2145       -3     
+ Partials      362      361       -1     
Impacted Files Coverage Δ
commands/mr/create/mr_create.go 28.76% <ø> (+0.11%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 054831b...fafcdfe. Read the comment docs.

@profclems profclems merged commit 9371da9 into profclems:trunk Feb 28, 2021
@profclems
Copy link
Owner

I will create a new release today since this resolves a problem that might possibly hinder workflow

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cmd: mr Issue is related to merge request management Fix This fixes a bug or incorrect documentation size/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't create MR from branch that is already pushed
2 participants