Skip to content

mr_create: fix the target remote#569

Merged
bmeneg merged 1 commit intozaquestion:masterfrom
atenart:mr-create-target-remote
Jan 22, 2021
Merged

mr_create: fix the target remote#569
bmeneg merged 1 commit intozaquestion:masterfrom
atenart:mr-create-target-remote

Conversation

@atenart
Copy link
Copy Markdown
Contributor

@atenart atenart commented Jan 19, 2021

Hi,

This fixes an issue where the target remote name can be wrong, if the repository wasn't forked from the target at first.

Thanks!

@prarit
Copy link
Copy Markdown
Collaborator

prarit commented Jan 21, 2021

Hi, due to no fault of yours the lab test code was broken. I have fixed the tests in #575 and #573 . Can you please rebase to see if your build will past testing? My sincere apologies for the inconvenience.

@atenart
Copy link
Copy Markdown
Contributor Author

atenart commented Jan 22, 2021

@prarit Sure, no problem, I'll rebase and update this PR.

The remote used as a target can be given in the command line with:

  lab mr create remote/repository/name

It was however not taken into account when comparing the branch to merge
and the target branch, and when making the cover letter template.
Instead the initial forked from branch was used, which would be invalid
if the repository wasn't forked at first from the target one. Fix this.

Signed-off-by: Antoine Tenart <atenart@kernel.org>
@atenart atenart force-pushed the mr-create-target-remote branch from 6676bdb to 7c7f840 Compare January 22, 2021 08:37
@codecov
Copy link
Copy Markdown

codecov Bot commented Jan 22, 2021

Codecov Report

Merging #569 (7c7f840) into master (7c2c165) will decrease coverage by 0.09%.
The diff coverage is 66.66%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #569      +/-   ##
==========================================
- Coverage   58.30%   58.20%   -0.10%     
==========================================
  Files          64       64              
  Lines        4197     4197              
==========================================
- Hits         2447     2443       -4     
- Misses       1516     1519       +3     
- Partials      234      235       +1     
Impacted Files Coverage Δ
cmd/mr_create.go 76.50% <66.66%> (ø)
cmd/fork.go 55.71% <0.00%> (-5.72%) ⬇️

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 7c2c165...7c7f840. Read the comment docs.

Copy link
Copy Markdown
Collaborator

@bmeneg bmeneg left a comment

Choose a reason for hiding this comment

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

Changes LGTM.
Thanks @atenart !

@bmeneg bmeneg merged commit 910234a into zaquestion:master Jan 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants