threads / discuss / 53552

Draft of Git Rev News edition 63

Subject: Draft of Git Rev News edition 63

## tl;dr

3 messages between May 26, 2020 and May 27, 2020.

replies: 2people: 2as markdown or json

Christian Couder· May 26, 2020, 17:10 UTC · lore

Hi everyone!

A draft of a new Git Rev News edition is available here:

  https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-63.md

Everyone is welcome to contribute in any section either by editing the above page on GitHub and sending a pull request, or by commenting on this GitHub issue:

  https://github.com/git/git.github.io/issues/430

You can also reply to this email.

In general all kinds of contribution, for example proofreading, suggestions for articles or links, help on the issues in GitHub, and so on, are very much appreciated.

I tried to cc everyone who appears in this edition, but maybe I missed some people, sorry about that.

Jakub, Markus, Kaartic and me plan to publish this edition on Thursday May 28th in the evening.

Thanks, Christian.

Damien Robert· May 27, 2020, 21:11 UTC · re: Christian Couder · lore

Re: Draft of Git Rev News edition 63

From Christian Couder, Tue 26 May 2020 at 19:10:32 (+0200) :

> A draft of a new Git Rev News edition is available here:
>   https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-63.md

> # Reviews
> remote.c: fix handling of push:remote_ref

Wow! I don't know who was motivated enough to go through the history of this series, but I am impressed. I just sent a pull request with some suggestions.

This series was a complete mess, a lesson learned is that I should stay focused on the original scope of the series, rather than try to extend it mid-way when I find other bugs in adjacent areas. And instead fix the new uncovered bugs in other series.

> This led to some release confusion as Junio then had merged the 2 patches to the next branch, while Damien had sent a version 8 that contains only his patch without the triangular workflow fixes and test cases.

> This last version is now merged in the pu branch, and will is likely to find its way to master, while hopefully the fixes related to triangular workflows will be re-sent separately.

In "What's cooking in git", the series is marked as stalled, so I think Junio is waiting for a reroll. I haven't forgotten about this series, but with the current situation I did not have time to rework on it.

Meanwhile, the version v8 in 'pu' does not detect triangular workflows (since I ejected that patch).

The version v6 in 'next' does, but there it has the corner case of a branch 'foo' which has a pushRemote=foobar but no remote and 'origin' does not exists. In this case %(push:remote_ref) detects a triangular workflow but `git push` does not.

So this is really a minor corner case (and I actually think its `git push` which should be fixed here), so it is not too bad that this version is in 'next', especially since there are still other bugs in the ref-filter machinery anyway (see eg https://public-inbox.org/git/20200418173651.djzriazxj5kbo6ax@doriath/ and https://public-inbox.org/git/20200416152145.wp2zeibxmuyas6y6@feanor/).

Best regards, Damien

Christian Couder· May 27, 2020, 21:54 UTC · re: Damien Robert · lore

Re: Draft of Git Rev News edition 63

On Wed, May 27, 2020 at 11:11 PM Damien Robert <damien.olivier.robert@gmail.com> wrote:

Show 11 quoted lines

>
> From Christian Couder, Tue 26 May 2020 at 19:10:32 (+0200) :
> > A draft of a new Git Rev News edition is available here:
> >   https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-63.md
>
> > # Reviews
> > remote.c: fix handling of push:remote_ref
>
> Wow! I don't know who was motivated enough to go through the history of this
> series, but I am impressed. I just sent a pull request with some
> suggestions.

Thanks! I merged your pull request and then reformatted the result a bit.

> This series was a complete mess, a lesson learned is that I should stay
> focused on the original scope of the series, rather than try to extend it
> mid-way when I find other bugs in adjacent areas. And instead fix the new
> uncovered bugs in other series.

Yeah, I hope that this lesson can be learned by others reading the article.

> In "What's cooking in git", the series is marked as stalled, so I think Junio
> is waiting for a reroll. I haven't forgotten about this series, but with
> the current situation I did not have time to rework on it.

Yeah, no worries about that. It's ok to take your time.

Show 15 quoted lines

> Meanwhile, the version v8 in 'pu' does not detect triangular workflows (since
> I ejected that patch).
>
> The version v6 in 'next' does, but there it has the corner case of
> a branch 'foo' which has a pushRemote=foobar but no remote and 'origin'
> does not exists. In this case %(push:remote_ref) detects a triangular
> workflow but `git push` does not.
>
> So this is really a minor corner case (and I actually think its `git push` which
> should be fixed here), so it is not too bad that this version is
> in 'next', especially since there are still other bugs in the ref-filter
> machinery anyway
> (see eg
> https://public-inbox.org/git/20200418173651.djzriazxj5kbo6ax@doriath/ and
> https://public-inbox.org/git/20200416152145.wp2zeibxmuyas6y6@feanor/).

Yeah, I think both versions v6 and v8 are already significant improvements over the current situation.

Thanks, Christian.