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

Fix filter by branch with globbing characters *?[] #8801

Merged
merged 3 commits into from Feb 4, 2021
Merged

Fix filter by branch with globbing characters *?[] #8801

merged 3 commits into from Feb 4, 2021

Conversation

NikolayXHD
Copy link
Member

@NikolayXHD NikolayXHD commented Jan 26, 2021

Fixes #8800

Test methodology

Manually

Test environment(s)

Windows 10


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

@NikolayXHD NikolayXHD added the 🚧 status: in progress Issues which have associated PRs label Jan 26, 2021
@NikolayXHD NikolayXHD self-assigned this Jan 26, 2021
@NikolayXHD NikolayXHD marked this pull request as draft January 26, 2021 01:59
@codecov
Copy link

codecov bot commented Jan 26, 2021

Codecov Report

Merging #8801 (589200c) into master (fb0aa6d) will increase coverage by 0.04%.
The diff coverage is 76.70%.

@@            Coverage Diff             @@
##           master    #8801      +/-   ##
==========================================
+ Coverage   55.99%   56.04%   +0.04%     
==========================================
  Files         905      920      +15     
  Lines       65301    65614     +313     
  Branches    11882    11999     +117     
==========================================
+ Hits        36568    36771     +203     
- Misses      25794    25842      +48     
- Partials     2939     3001      +62     
Flag Coverage Δ
production 43.19% <75.74%> (+0.04%) ⬆️
tests 94.45% <83.73%> (-0.02%) ⬇️

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

GitCommands/RevisionReader.cs Outdated Show resolved Hide resolved
GitCommands/RevisionReader.cs Outdated Show resolved Hide resolved
@NikolayXHD NikolayXHD removed the 🚧 status: in progress Issues which have associated PRs label Feb 3, 2021
@NikolayXHD NikolayXHD marked this pull request as ready for review February 3, 2021 00:55
Copy link
Member

@gerhardol gerhardol left a comment

Choose a reason for hiding this comment

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

+1
You get "no results" with wildcards. Not really a problem.
Useful.

image

$"--pretty=format:\"{FullFormat}\"",
{
Copy link
Member

Choose a reason for hiding this comment

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

Any reason to switch order?

I would pprefer to move this option close to the other where branchFilter is handled (either here or to line 194)

Copy link
Member Author

Choose a reason for hiding this comment

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

Any reason to switch order?

No reason, my mistake. Moved back to where it was.

@NikolayXHD NikolayXHD merged commit b2a1696 into gitextensions:master Feb 4, 2021
@ghost ghost added this to the 3.6 milestone Feb 4, 2021
@NikolayXHD NikolayXHD deleted the branch_filter_globbing branch February 4, 2021 00:24
RussKie pushed a commit that referenced this pull request Feb 4, 2021
Fix filter by branch with globbing characters *?[]

(cherry picked from commit b2a1696)
@RussKie RussKie modified the milestones: 3.6, 3.5 Feb 4, 2021
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.

Filter by branches does not apply if contains globbing characters [?*
3 participants