git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Damien Robert <damien.olivier.robert@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (Apr 2020, #01; Wed, 15)
Date: Fri, 17 Apr 2020 01:05:54 +0200	[thread overview]
Message-ID: <20200416230554.bhk2yfycjwjpxggy@doriath> (raw)
In-Reply-To: <20200416224708.zr4dlrz4hpaqsz2s@doriath>

From Damien Robert, Fri 17 Apr 2020 at 00:47:11 (+0200) :
> The triangular workflow patch is not quite correct in the sense that it
> does not handle (yet) all cases

Here were the two reasons for the RFC of this patch e3165570dfca690ea1a71518799153f6350777ae

- in is_workflow_triangular I compute the fetch and push remote. But the push
remote is computed again in branch_get_remote_ref. So we redo an already
done computation.

- Also in
struct remote *fetch_remote = remote_get(remote_for_branch(branch, NULL));
I don't check the value of *explicit.

This means that I get the fallback of 'origin' if no remote is specified.
So if I set a pushRemote="foobar" but no remote, then remote.c will
consider we are in a triangular workflow but git push will not.

  reply	other threads:[~2020-04-16 23:06 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-15 23:01 What's cooking in git.git (Apr 2020, #01; Wed, 15) Junio C Hamano
2020-04-16 15:28 ` Elijah Newren
2020-04-16 16:37   ` Junio C Hamano
2020-04-16 21:12 ` Damien Robert
2020-04-16 21:30   ` Jeff King
2020-04-16 22:18     ` Junio C Hamano
2020-04-16 22:47       ` Damien Robert
2020-04-16 23:05         ` Damien Robert [this message]
2020-04-16 23:34           ` Junio C Hamano
2020-04-17 12:54             ` Damien Robert
2020-04-17 17:30               ` Junio C Hamano
2020-04-17 22:04                 ` Damien Robert
2020-04-17 23:22                   ` Junio C Hamano
2020-04-18 17:36                     ` Damien Robert
2020-04-17  2:24 ` Danh Doan
2020-04-17  5:38   ` Junio C Hamano
2020-04-17 13:36     ` Danh Doan
2020-04-17 17:40       ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200416230554.bhk2yfycjwjpxggy@doriath \
    --to=damien.olivier.robert@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).