mbox series

[v2,0/2] b4: ty: Fix incorrect patch/commit association

Message ID 20240304134241.20447-1-will@kernel.org (mailing list archive)
Headers show
Series b4: ty: Fix incorrect patch/commit association | expand

Message

Will Deacon March 4, 2024, 1:42 p.m. UTC 
Hi folks,

It's me again. This time I fixed my git configuration so that the
authorship is correct and matches the S-o-B line. That's the only change
since the v1 I sent on Friday.

Enjoy!

Will

Cc: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: Nicolin Chen <nicolinc@nvidia.com>

--->8

Will Deacon (2):
  ty: Try subject matching for every commit before using trackers
  ty: Remove unused 'matches' variable

 src/b4/ty.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Comments

Konstantin Ryabitsev March 4, 2024, 9:32 p.m. UTC | #1 
On Mon, 04 Mar 2024 13:42:39 +0000, Will Deacon wrote:
> It's me again. This time I fixed my git configuration so that the
> authorship is correct and matches the S-o-B line. That's the only change
> since the v1 I sent on Friday.
> 
> Enjoy!
> 
> Will
> 
> [...]

Applied, thanks!

[1/2] ty: Try subject matching for every commit before using trackers
      commit: 8a3d8bfae18ad1f4c72b91e6a8d37e12f9b5dcb4
[2/2] ty: Remove unused 'matches' variable
      commit: bb6d9075ae89df46ad91e85466a7b01f6aa534d8

Best regards,
Konstantin Ryabitsev May 1, 2024, 9:23 p.m. UTC | #2 
On Mon, 04 Mar 2024 13:42:39 +0000, Will Deacon wrote:
> It's me again. This time I fixed my git configuration so that the
> authorship is correct and matches the S-o-B line. That's the only change
> since the v1 I sent on Friday.
> 
> Enjoy!
> 
> Will
> 
> [...]

Applied, thanks!

[1/2] ty: Try subject matching for every commit before using trackers
      commit: 47bd55d3182d875802700670270f5ee0877a8d5d
[2/2] ty: Remove unused 'matches' variable
      commit: dced92071d2135ccbec521cb4face63cafcdc407

Best regards,
Will Deacon May 2, 2024, 9:23 a.m. UTC | #3 
On Wed, May 01, 2024 at 05:23:12PM -0400, Konstantin Ryabitsev wrote:
> 
> On Mon, 04 Mar 2024 13:42:39 +0000, Will Deacon wrote:
> > It's me again. This time I fixed my git configuration so that the
> > authorship is correct and matches the S-o-B line. That's the only change
> > since the v1 I sent on Friday.
> > 
> > Enjoy!
> > 
> > Will
> > 
> > [...]
> 
> Applied, thanks!
> 
> [1/2] ty: Try subject matching for every commit before using trackers
>       commit: 47bd55d3182d875802700670270f5ee0877a8d5d
> [2/2] ty: Remove unused 'matches' variable
>       commit: dced92071d2135ccbec521cb4face63cafcdc407

You applied these already (with different SHAs), I think:

https://lore.kernel.org/r/170958794467.8875.12454526353405240108.b4-ty@linuxfoundation.org

So I'm not sure what's happened here :/

Will
Konstantin Ryabitsev May 2, 2024, 6:31 p.m. UTC | #4 
On Thu, May 02, 2024 at 10:23:54AM GMT, Will Deacon wrote:
> > Applied, thanks!
> > 
> > [1/2] ty: Try subject matching for every commit before using trackers
> >       commit: 47bd55d3182d875802700670270f5ee0877a8d5d
> > [2/2] ty: Remove unused 'matches' variable
> >       commit: dced92071d2135ccbec521cb4face63cafcdc407
> 
> You applied these already (with different SHAs), I think:
> 
> https://lore.kernel.org/r/170958794467.8875.12454526353405240108.b4-ty@linuxfoundation.org
> 
> So I'm not sure what's happened here :/

Bah, you're right. I blame the split brain between b4 and patchwork here 
-- for some reason in patchwork these were still showing as unprocessed.

Effectively the 2nd time was a no-op:

  $ git log --oneline --reverse 590044aff85f3e11cbd5efb9e192847bb3b51b3f..
  47bd55d ty: Try subject matching for every commit before using trackers
  dced920 ty: Remove unused 'matches' variable
  775893e (HEAD -> master, origin/master, github/master) Merge patch series "b4: ty: Fix incorrect patch/commit association"
  $ git diff 590044aff85f3e11cbd5efb9e192847bb3b51b3f..
  (no output)

I am actually annoyed that this operation doesn't throw an error and 
doubly annoyed that the only way to fix this is to rebase -- but rebase 
I will.

Sorry about the mess.

-K