log: add option to search for header or body #1710
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Note to reviewer: please help me come up with a better name than |
|
/preview |
|
Preview email sent as [email protected] |
|
/submit |
|
Submitted as [email protected] To fetch this version into To fetch this version to local tag |
|
On the Git mailing list, Phillip Wood wrote (reply to this): Hi Max
On 05/04/2024 22:48, Max Coplan via GitGitGadget wrote:
> From: =?UTF-8?q?Max=20=F0=9F=91=A8=F0=9F=8F=BD=E2=80=8D=F0=9F=92=BB=20Copl?=
> =?UTF-8?q?an?= <[email protected]>
> > Note to reviewer: I hate the name `--header-or`! Please help me come up
> with a better name.
> > Summary:
> This change adds a new option to `git log` that allows users to search
> for commits that match either the author or the commit message. This is
> useful for finding commits that were either authored or co-authored by a
> specific person.
I think that having a way to find all the commits that are authored by, or have a specific trailer naming someone is a good idea. I'm not sure about combining "--author" with "--grep" to do it though. Perhaps we could design a new option (tentatively called "--indent") that allows the user to specify a name and which trailers and commit headers (author and/or committer) to match.
A couple of house keeping notes. We do not use the "feat(...)" style of commit messages in this project. The subject line should just start with "log: " the rest of the subject looks fine. I think everything under the "Summary:" line above does a good job of explaining why the change is useful which is great. We tend to avoid emoji's in peoples names as well.
> [...]
> +test_expect_success 'log --grep --author --header-or uses union' '
> + # grep matches only third and fourth
> + # author matches only initial and third
I'm a bit confused by this comment as we seem to only expect "third" and "fourth" below - what happened to "initial"?
> + git log --author="A U Thor" --grep=r --header-or --format=%s >actual &&
> + {
> + echo fourth && echo third
> + } >expect &&
We have a test helper to help with this
test_write_lines fourth third >expect
Best Wishes
Phillip |
|
User |
|
There are issues in commit f38e52f: |
Summary:
This change adds a new option to `git log` that allows users to search
for commits that match either the author or the commit message. This is
useful for finding commits that were either authored or co-authored by a
specific person.
Currently, the best way to find a commit either authored or co-authored
by a specific person is to use
```sh
$ echo \
$(git log --author=Torvalds --pretty="%cd,%H\n" --date=iso-strict) \
$(git log --grep="Co-authored-by: .*Torvalds" --pretty="%cd,%H\n" --date=iso-strict) \
| sort -n --reverse \
| awk -F, '{print $2}' \
| tr '\n' '\t' \
| xargs git show --stat --stdin
```
This is a bit of a pain, so this change adds a new option to `git log`.
Now finding either authors or co-authors is as simple as
```sh
$ git log --author=Torvalds --grep=Torvalds --match-header-or-grep
```
Test plan:
1. create commit authored by A and co-authored-by B
2. create commit authored by B
3. run
```sh
$ git log --author=B --grep="Co-authored-by: B" --match-header-or-grep
```
4. expect to see both commits
Signed-off-by: Max 👨🏽💻 Coplan <[email protected]>
vegerot
changed the title
git log
|
/submit |
|
Submitted as [email protected] To fetch this version into To fetch this version to local tag |
|
On the Git mailing list, Junio C Hamano wrote (reply to this): "Max Coplan via GitGitGadget" <[email protected]> writes:
> This change adds a new option to `git log` that allows users to search
> for commits that match either the author or the commit message. This is
> useful for finding commits that were either authored or co-authored by a
> specific person.
I have this feeling that the "solution" presented is not quite
addressing the use case in a more useful and direct way than it
could be. When I designed how the --author/--committer restriction
and --grep in the body of the message interact, I made a concious
decision that "among those commits that were authored by person X,
find the ones that mention Y" is far more useful than "done by X, or
done by anybody that mention Y", especially when Y is just a text
search in the free form. There was nothing that limits the mention
of Y to those specifically involved in the commit---the mention could
just have been part of text, like "earlier Max Coplan sent a patch,
but this commit is not related to it".
But these days, we have a more established "convention" that lists
people at the end in the form of "trailers", and that changes the
picture quite a lot from how the world order was back then.
In other words, if the true objective is to find commits that
involved person X, Y or Z (which is very common and would be a lot
more useful than finding those that involve all of them), shouldn't
we be limiting the --grep side even further so that a random mention
of person Y is excluded and hit is counted only when person Y is
mentioned on a trailer (while loosening the --author side so that it
is OR'ed instead of AND'ed)?
I am imagining a pair of new options to name people (all OR'ed) and
to name places the names of these people should appear (again, all
OR'ed). I am not good at naming, so the option names in the example
is not more than illustration of an idea and not my recommendation,
but a command:
git log --by="Max Coplan" --by="Junio C Hamano" \
--by-where=author,Signed-off-by,Co-authored-by
would find a commit that has one (or more) of the given names
in one (or more) of the places that are specified, where the places
can be either "author", "committer" to specify these headers in the
commit object, or random other string to specify trailer lines with
given keys.
Hmm? |
|
On the Git mailing list, Phillip Wood wrote (reply to this): On 07/04/2024 07:08, Junio C Hamano wrote:
> "Max Coplan via GitGitGadget" <[email protected]> writes:
> I am imagining a pair of new options to name people (all OR'ed) and
> to name places the names of these people should appear (again, all
> OR'ed). I am not good at naming, so the option names in the example
> is not more than illustration of an idea and not my recommendation,
> but a command:
> > git log --by="Max Coplan" --by="Junio C Hamano" \
> --by-where=author,Signed-off-by,Co-authored-by
> > would find a commit that has one (or more) of the given names
> in one (or more) of the places that are specified, where the places
> can be either "author", "committer" to specify these headers in the
> commit object, or random other string to specify trailer lines with
> given keys.
I like this, yesterday[1] I didn't have a clear idea in my head of how such an option should work but I think passing the names and the fields to match those names against as two separate options is a good idea.
Best Wishes
Phillip
[1] https://lore.kernel.org/git/[email protected]/ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
cc: Phillip Wood [email protected]
cc: strager [email protected]
cc: me [email protected]