Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FormPush show ahead/behind for multiple branches #8573

Conversation

gerhardol
Copy link
Member

@gerhardol gerhardol commented Oct 24, 2020

Part of #8553

Based on #8562 , really separated of the original intended change

Proposed changes

Only show remote branch name if there is a tracking branch
Show ahead/behind information in FormPush multiple branches, like "0↑↓" and "gone" added in #8562
If the current branch is not the tracking branch but a name match is possible, show "=" and "<>".

(gone is discussed in #8562)

Screenshots

Before

image

image

After

image

image

Test methodology

Manual, added test for GitRef


✒️ I contribute this code under The Developer Certificate of Origin.

@ghost ghost assigned gerhardol Oct 24, 2020
@gerhardol gerhardol marked this pull request as draft October 24, 2020 23:18
@gerhardol gerhardol force-pushed the feature/i8553-formpush-multiple-aheadbehind branch from a6db253 to 6e622e7 Compare October 25, 2020 09:11
@codecov
Copy link

codecov bot commented Oct 25, 2020

Codecov Report

Merging #8573 into master will decrease coverage by 0.00%.
The diff coverage is 44.44%.

@@            Coverage Diff             @@
##           master    #8573      +/-   ##
==========================================
- Coverage   55.11%   55.11%   -0.01%     
==========================================
  Files         904      904              
  Lines       65425    65465      +40     
  Branches    11834    11854      +20     
==========================================
+ Hits        36059    36080      +21     
- Misses      26540    26559      +19     
  Partials     2826     2826              
Flag Coverage Δ
production 42.04% <18.91%> (-0.01%) ⬇️
tests 94.85% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

@gerhardol gerhardol force-pushed the feature/i8553-formpush-multiple-aheadbehind branch 2 times, most recently from ba821f3 to f29758d Compare October 31, 2020 00:11
@gerhardol gerhardol force-pushed the feature/i8553-formpush-multiple-aheadbehind branch from f29758d to e612054 Compare October 31, 2020 09:32
@gerhardol gerhardol marked this pull request as ready for review October 31, 2020 09:33
@RussKie RussKie merged commit 7c92a71 into gitextensions:master Nov 1, 2020
@ghost ghost added this to the 4.0 milestone Nov 1, 2020
@gerhardol gerhardol deleted the feature/i8553-formpush-multiple-aheadbehind branch November 1, 2020 11:23
pmiossec added a commit to pmiossec/gitextensions that referenced this pull request Nov 4, 2020
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.

None yet

2 participants