Re: [PATCH 1/1] Fix %(push:track) in ref-filter

2019-04-17 Thread Junio C Hamano
Damien Robert writes: > From: Damien Robert > Date: Tue, 16 Apr 2019 14:16:46 +0200 > Subject: [PATCHv3 1/1] ref-filter: use correct branch for %(push:track) > > In ref-filter.c, when processing the atom %(push:track), the > ahead/behind values are computed using `stat_tracking_info` which refer

Re: [PATCH 1/1] Fix %(push:track) in ref-filter

2019-04-17 Thread Damien Robert
>From Jeff King, Tue 16 Apr 2019 at 17:48:43 (-0400) : > The name "compare_info" is a bit vague. Perhaps "stat_branch_pair" or > something would be more descriptive. Done. > ref-filter: use correct branch for %(push:track) Done. > s/refer/&s/ > s/change/&s/ Grmf, thanks. > Is it worth chang

Re: [PATCH 1/1] Fix %(push:track) in ref-filter

2019-04-16 Thread Jeff King
gestions are a normal part of review). Overall the patch looks good to me. I have a few extremely minor nits: > Subject: [v2 PATCH 1/1] Fix %(push:track) in ref-filter We'd usually say "area: do something" here, and it's nice to stay consistent so that reading --onelin

Re: [PATCH 1/1] Fix %(push:track) in ref-filter

2019-04-16 Thread Christian Couder
On Tue, Apr 16, 2019 at 2:42 PM Damien Robert wrote: > You are welcome. What's the standard way to acknowledge your help in > the Foo-By: trailers? I did not put a Reviewed-By: because you reviewed the > previous patch, not the current one :) We often use: Helped-by: Jeff King

Re: [PATCH 1/1] Fix %(push:track) in ref-filter

2019-04-16 Thread Damien Robert
ork' remote branch. > Thanks for working on this. You are welcome. What's the standard way to acknowledge your help in the Foo-By: trailers? I did not put a Reviewed-By: because you reviewed the previous patch, not the current one :) -- Damien Robert http://www.normalesup.org/~r

Re: [PATCH 1/1] Fix %(push:track) in ref-filter

2019-04-15 Thread Jeff King
On Mon, Apr 15, 2019 at 11:04:16PM +0200, Damien Robert wrote: > In ref-filter.c, when processing the atom %(push:track), the > ahead/behind values are computed using `stat_tracking_info` which refers > to the upstream branch. Good catch. I think this has been broken since %(push) was added in 29

[PATCH 1/1] Fix %(push:track) in ref-filter

2019-04-15 Thread Damien Robert
In ref-filter.c, when processing the atom %(push:track), the ahead/behind values are computed using `stat_tracking_info` which refers to the upstream branch. Fix that by introducing a new function `stat_push_info` in remote.c (exported in remote.h), which does the same thing but for the push branc