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

Exclude boundary commits with --grep #10076

Merged

Conversation

gerhardol
Copy link
Member

Fixes #10074

Proposed changes

git-log --boundary and --all is included in many revision listings. (The options are currently used together.)
This basically means that the parent to matches is included. This may be desired in some situations, but not with --grep.

It is not obvious that --boundary and --grep should be used where they are used now.
Similarly, -all may still be used with --grep. (I do not see how that is used at all though.)
The options can be tuned and expanded in general...

Also fixed the label for search.

Screenshots

Before

image

image

After

image

image

Test methodology

Manual

Merge strategy

I agree that the maintainer squash merge this PR (if the commit message is clear).


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

@ghost ghost assigned gerhardol Jul 20, 2022
@gerhardol gerhardol requested a review from mstv July 20, 2022 21:22
Copy link
Member

@mstv mstv left a comment

Choose a reason for hiding this comment

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

👍

@RussKie
Copy link
Member

RussKie commented Jul 20, 2022 via email

@gerhardol
Copy link
Member Author

Do we tests for this?

No. It seems like there is no reasoning to the configuration, which is needed first.

@gerhardol gerhardol force-pushed the feature/i10074-grep-boundary branch from 378b3ab to d83563f Compare July 22, 2022 21:54
@gerhardol
Copy link
Member Author

Rebased, added a stupid test

Copy link
Member

@RussKie RussKie left a comment

Choose a reason for hiding this comment

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

👀

GitUI/UserControls/RevisionGrid/FilterInfo.cs Outdated Show resolved Hide resolved
Copy link
Member

@RussKie RussKie left a comment

Choose a reason for hiding this comment

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

LGTM modulo the question about the attribute

@gerhardol gerhardol merged commit 02173f3 into gitextensions:master Jul 25, 2022
@gerhardol gerhardol deleted the feature/i10074-grep-boundary branch July 25, 2022 14:40
@ghost ghost added this to the vNext milestone Jul 25, 2022
RussKie pushed a commit that referenced this pull request Jul 28, 2022
Incorrect label for search with --grep

(cherry picked from commit 02173f3)
@RussKie RussKie modified the milestones: vNext, 4.0.0 Jul 28, 2022
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.

Text filter: sort search results by date
3 participants