Re: Draft of Git Rev News edition 63

From: Damien Robert <damien.olivier.robert@gmail.com>
To: Christian Couder <christian.couder@gmail.com>
Cc: git <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>,
	Jakub Narebski <jnareb@gmail.com>,
	Markus Jansen <mja@jansen-preisler.de>,
	Kaartic Sivaraam <kaartic.sivaraam@gmail.com>,
	Jeff King <peff@peff.net>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Hariom verma <hariom18599@gmail.com>,
	Heba Waly <heba.waly@gmail.com>,
	Shourya Shukla <shouryashukla.oo@gmail.com>,
	Derrick Stolee <stolee@gmail.com>,
	Abhishek Kumar <abhishekkumar8222@gmail.com>,
	Elijah Newren <newren@gmail.com>
Subject: Re: Draft of Git Rev News edition 63
Date: Wed, 27 May 2020 23:11:40 +0200	[thread overview]
Message-ID: <20200527211140.qbgbbitoxr4mx7gk@feanor> (raw)
In-Reply-To: <CAP8UFD3MvaAPMUwc=hW-bayDbNpxSX3jtMiPQro4b2Ai17GkNg@mail.gmail.com>

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