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

Show empty diffs as patch, not text #8482

Merged

Conversation

gerhardol
Copy link
Member

Fixes #5547

Proposed changes

  • A null patch was displayed as a text file instead of a patch, so the toolbar was missing

Screenshots

Before

image

After

image

Test methodology

Manual

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

@ghost ghost assigned gerhardol Sep 26, 2020
@codecov
Copy link

codecov bot commented Sep 26, 2020

Codecov Report

Merging #8482 into master will decrease coverage by 0.03%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master    #8482      +/-   ##
==========================================
- Coverage   53.97%   53.93%   -0.04%     
==========================================
  Files         883      879       -4     
  Lines       63499    63461      -38     
  Branches    11375    11375              
==========================================
- Hits        34271    34227      -44     
- Misses      26559    26562       +3     
- Partials     2669     2672       +3     
Flag Coverage Δ
#production 41.07% <0.00%> (-0.02%) ⬇️
#tests 94.72% <ø> (-0.01%) ⬇️

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

@gerhardol
Copy link
Member Author

@msftbot merge in 24 hours

@ghost ghost added the status: auto merge label Sep 26, 2020
@ghost
Copy link

ghost commented Sep 26, 2020

Hello @gerhardol!

Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:

  • I won't merge this pull request until after the UTC date Sun, 27 Sep 2020 20:25:17 GMT, which is in 1 day

If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you".

@RussKie RussKie merged commit 428372f into gitextensions:master Sep 27, 2020
@ghost ghost added this to the 4.0 milestone Sep 27, 2020
@gerhardol gerhardol deleted the feature/i5547-empty-patch-toolbar branch September 27, 2020 08:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bug: Diff Pane blank when Ignore Whitespace hides whitespace-only diffs
3 participants