diff options
| author | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2022-08-31 17:39:00 -0400 |
|---|---|---|
| committer | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2022-08-31 17:39:00 -0400 |
| commit | 1ee1cff0a8e7c8ca0aa4992535de78aa54aebcb3 (patch) | |
| tree | ce5024c4a69f9651f880ae04a49d57daae879044 | |
| parent | 3b34443b1e40205bf4ed5a974674a5bfbad01a2c (diff) | |
| download | b4-1ee1cff0a8e7c8ca0aa4992535de78aa54aebcb3.tar.gz | |
trailers: ignore merges when looking at the commit log
When finding the range of most recent commits for b4 trailers -u, ignore
any merge commits.
Reported-by: Vishal Verma <vishal@kernel.org>
Link: https://msgid.link/2517d5cdff57048a13e85b9604957b73b69724c3.camel@kernel.org
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
| -rw-r--r-- | b4/ez.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -637,7 +637,7 @@ def update_trailers(cmdargs: argparse.Namespace) -> None: # There doesn't appear to be a great way to find the first commit # where we're NOT the committer, so we get all commits since range specified where # we're the committer and stop at the first non-contiguous parent - gitargs = ['log', '-F', f'--committer={myemail}', '--since', cmdargs.since, '--format=%H %P'] + gitargs = ['log', '-F', '--no-merges', f'--committer={myemail}', '--since', cmdargs.since, '--format=%H %P'] lines = b4.git_get_command_lines(None, gitargs) if not lines: logger.critical('CRITICAL: could not find any commits where committer=%s', myemail) |