From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC6EEC4708F for ; Tue, 1 Jun 2021 15:57:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CFA5C6108D for ; Tue, 1 Jun 2021 15:57:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234346AbhFAP6q (ORCPT ); Tue, 1 Jun 2021 11:58:46 -0400 Received: from smtp.hosts.co.uk ([85.233.160.19]:47932 "EHLO smtp.hosts.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230288AbhFAP6p (ORCPT ); Tue, 1 Jun 2021 11:58:45 -0400 Received: from host-92-14-216-189.as13285.net ([92.14.216.189] helo=[192.168.1.37]) by smtp.hosts.co.uk with esmtpa (Exim) (envelope-from ) id 1lo6lL-000Ccd-6w; Tue, 01 Jun 2021 16:57:03 +0100 Subject: Re: [PATCH v2 6/6] doc: push: explain default=simple correctly To: Felipe Contreras , Junio C Hamano Cc: git@vger.kernel.org, Elijah Newren , Mathias Kunter , =?UTF-8?B?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Ramkumar Ramachandra , Jeff King , =?UTF-8?Q?Ren=c3=a9_Scharfe?= , Matthieu Moy References: <20210529071115.1908310-1-felipe.contreras@gmail.com> <20210529071115.1908310-7-felipe.contreras@gmail.com> <60b49a3ae829b_24d28208fd@natae.notmuch> <60b62420858c4_e409520828@natae.notmuch> From: Philip Oakley Message-ID: Date: Tue, 1 Jun 2021 16:57:01 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 MIME-Version: 1.0 In-Reply-To: <60b62420858c4_e409520828@natae.notmuch> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-GB Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 01/06/2021 13:12, Felipe Contreras wrote: > So it's more like: > > centralized = ~decentralized > triangular = ~two-way > > A centralized workflow consists of a single repository where branches > are typically two-way, but not necessarily. > > A decentralized workflow consists of multiple repositories where > branches are typically triangular, but not necessarily. > > So the triangularity is per branch, not per repository, and same_repo > means a two-way branch, could be a centralized or decentralized > workflow. My personal viewpoint is that triangular flow happens when you cannot push to the repo you consider as upstream. Rather you typically have a publish/backup repo instead (semi-public, semi-private - few are interested ;-). That (can't push one way around the triangle) part of the flow is separate from the distinction between patch flows and merge (Pull) request flows. E.g. My personal Git repo can be triangular with both git.git and git-for-windows, plus a few (what I view as) fetch-only repos from other collaborators/maintainers beyond the triangular 'golden' upstream repo. I often consider GitHub as a centraliser, but I don't think it's what is being considered above. -- A thought did come to mind that a Git serve/repo (typically bare) should be able to offer a 'refs/users/*' space (c.f. refs/remotes used by individual users) that allows a type of 'centralised' operation (almost as if all the users used a common alternates repo). Users could only push to their own /user refs, but could pull from the main refs/heads, and their own refs/users/ space. This would give flexibility to smaller corporate central operations to offer 'triangular flow' where each dev would feel like they have their own 'push' repo, when in reality it's really personalised branches. As usual the authentication of user names being handed off elsewhere;-). It could avoid some of the --alternate management aspects. It's a thought.. -- Philip