Re: [PATCH v8 1/1] remote.c: fix handling of %(push:remoteref)

Hi Junio,

From Junio C Hamano, Thu 03 Sep 2020 at 15:01:10 (-0700) :

Unfortunately no, work keep stacking up faster than I can unstack it...

Hum, what about migrating the version that was in next to master? I am not fond of it because the series is not perfect and I am not satisfied with a patch series that is not as good as I would like it to be. So that was why I was arguing against merging it back then.

On the other hand it does correct existing bugs, and the bugs it leaves remaining (apart from the memory leak) happens only in exotic cases. So I would not want my sense of perfection to prevent this series from graduating too long.

And unfortunately I cannot give you an ETA for a fully satisfying series as I envision it.

So I guess it is your call. If you think the version that was in next is good enough to graduate, I can send one last reroll with a commit message explaining the remaining kinks, and iron them out later.

Or more precisely, we can:
- only use this patch (v8) without the triangular workflow fixes
- use this patch (v8) + the triangular workflow fixes from https://public-inbox.org/git/20200406175648.25737-2-damien.olivier.robert+git@gmail.com/

The 'bug' that remains is that it detects a triangular setup, when
1) a branch has a pushRemote but no remote and
2) pushRemote=foobar and origin does not exists
while 'git push' treat this as a non triangular workflow.

IMHO 'git push' is wrong here and in my ideal perfect series it would be fixed there, but maybe meanwhile we can live with this small discrepancy.

What do you think?