From patchwork Mon May 31 19:32:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12289921 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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 CAF6EC47080 for ; Mon, 31 May 2021 19:32:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A638161263 for ; Mon, 31 May 2021 19:32:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231986AbhEaTe3 (ORCPT ); Mon, 31 May 2021 15:34:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231201AbhEaTe0 (ORCPT ); Mon, 31 May 2021 15:34:26 -0400 Received: from mail-ot1-x333.google.com (mail-ot1-x333.google.com [IPv6:2607:f8b0:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 364D5C06174A for ; Mon, 31 May 2021 12:32:44 -0700 (PDT) Received: by mail-ot1-x333.google.com with SMTP id c31-20020a056830349fb02903a5bfa6138bso5071422otu.7 for ; Mon, 31 May 2021 12:32:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nNW1CO3yTysZoyRYWMhyqqzDakdJbw5uPmBrNjCnOY8=; b=sEDbUL7ZLNEwvId9wRaIwldk02rb+T/7h3WwCjjCbDmaB8yaguI5dZAWkajc6k71nx zTq4AMsYNBG3mmc97SInNcxdgHsn3uA7A6J5d6ssju0dCiF4akomc9kHy5v9YPABn07q DDNCvywWC4+0For5trZ+YUsyPVBGdfSs+goWLnxu42a8aDw5zyr0LuDo+5E4atEZoZkE xrhhuYdaL22RZJrH/dIIHHjBqem+HR5n1ZoyYk364bKElRXFIOtt20hWf30rSOvIdJiB sYuAnz/E55S4TP2BEn0USoP6BoKpTffY/WMTPW1s8KPp568eB/TXj0sWJY6zrHjOn5Fp Cztg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nNW1CO3yTysZoyRYWMhyqqzDakdJbw5uPmBrNjCnOY8=; b=Fn93OKm98/OuC9IG1z3GoDO2tL4VU4m/+j/VV+gpk4tXS4wXsKDN7tVvFNSayaQjhQ wkNqI2XJWuIleGMp5X8Hzc9dzMnfujuNrMnbWDsAdPAO2ApHrbuQoNrfPoKJIb/QF5j6 e0H2FIvHE1xISjhPcL5flmnblSFMLz5uvXv7OEIiMYB561r0PooOVaX1kat8DncZpbPi xsRJKC3ArIVKd87S2CnQg7xarsmNDJdRMx55PzY5bBbzXxSd+FoAIhmM06AGYN1XS0dY hqjBh4OLi2QkRuzop+0kp8hXF1Xf/Oy7zN5GA0C6/9dM2yzQqIcIqaXhVt2zaenNOXzf xSnw== X-Gm-Message-State: AOAM531AgJZgj+MNu3hcvF7/GwT1QAPoImzaQy4Y11gNU2+6oo7vIIvR K+iovp6t0DvSwZDrNt5U1cpPjU24VUcajA== X-Google-Smtp-Source: ABdhPJx3TY021C93dg9pmlHqwGJ18R7zB0mHTxmno0efRpiNZTSNv8UwmWSGcZdF+VREwf/8GCsEmA== X-Received: by 2002:a05:6830:244e:: with SMTP id x14mr19068797otr.138.1622489563315; Mon, 31 May 2021 12:32:43 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id a5sm3478412otb.41.2021.05.31.12.32.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 12:32:42 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= , Jeff King , Junio C Hamano , Felipe Contreras Subject: [PATCH v3 1/7] push: rename !triangular to same_remote Date: Mon, 31 May 2021 14:32:31 -0500 Message-Id: <20210531193237.216726-2-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210531193237.216726-1-felipe.contreras@gmail.com> References: <20210531193237.216726-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The typical case is what git was designed for: distributed remotes. It's only the atypical case--fetching and pushing to the same remote--that we need to keep an eye on. No functional changes. Liked-by: Junio C Hamano Signed-off-by: Felipe Contreras --- builtin/push.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index 194967ed79..06406353ce 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -186,7 +186,7 @@ static const char message_detached_head_die[] = " git push %s HEAD:\n"); static void setup_push_upstream(struct remote *remote, struct branch *branch, - int triangular, int simple) + int same_remote, int simple) { if (!branch) die(_(message_detached_head_die), remote->name); @@ -201,7 +201,7 @@ static void setup_push_upstream(struct remote *remote, struct branch *branch, if (branch->merge_nr != 1) die(_("The current branch %s has multiple upstream branches, " "refusing to push."), branch->name); - if (triangular) + if (!same_remote) die(_("You are pushing to remote '%s', which is not the upstream of\n" "your current branch '%s', without telling me what to push\n" "to update which remote branch."), @@ -223,16 +223,16 @@ static void setup_push_current(struct remote *remote, struct branch *branch) refspec_appendf(&rs, "%s:%s", branch->refname, branch->refname); } -static int is_workflow_triangular(struct remote *remote) +static int is_same_remote(struct remote *remote) { struct remote *fetch_remote = remote_get(NULL); - return (fetch_remote && fetch_remote != remote); + return (!fetch_remote || fetch_remote == remote); } static void setup_default_push_refspecs(struct remote *remote) { struct branch *branch = branch_get(NULL); - int triangular = is_workflow_triangular(remote); + int same_remote = is_same_remote(remote); switch (push_default) { default: @@ -242,14 +242,14 @@ static void setup_default_push_refspecs(struct remote *remote) case PUSH_DEFAULT_UNSPECIFIED: case PUSH_DEFAULT_SIMPLE: - if (triangular) + if (!same_remote) setup_push_current(remote, branch); else - setup_push_upstream(remote, branch, triangular, 1); + setup_push_upstream(remote, branch, same_remote, 1); break; case PUSH_DEFAULT_UPSTREAM: - setup_push_upstream(remote, branch, triangular, 0); + setup_push_upstream(remote, branch, same_remote, 0); break; case PUSH_DEFAULT_CURRENT: From patchwork Mon May 31 19:32:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12289923 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=-12.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, USER_AGENT_GIT autolearn=ham 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 72B6DC47082 for ; Mon, 31 May 2021 19:32:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 535B761263 for ; Mon, 31 May 2021 19:32:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232009AbhEaTec (ORCPT ); Mon, 31 May 2021 15:34:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231792AbhEaTe1 (ORCPT ); Mon, 31 May 2021 15:34:27 -0400 Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A746CC061760 for ; Mon, 31 May 2021 12:32:45 -0700 (PDT) Received: by mail-ot1-x335.google.com with SMTP id i12-20020a05683033ecb02903346fa0f74dso11998498otu.10 for ; Mon, 31 May 2021 12:32:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m9c/HJ7Sy0ScaPhRt42O0eYelD2BiaK2jTOgIvBXfFQ=; b=AHtXkFH5XymbmpgsmmSXgbzHK0ZItSWskDdWEG6bogvV3Om45tVsoye+2ZHdgEWx24 I6VjNjjI4AcZVnupG36Brpc+51vH+823RWOhlo0KKtrHrewGQjW687wb9HsQKOeGxM6f J9tp6rojerz1cku6REVcpxnjC1DHtSIZEbNcwLR9x9wOR9KvABlPKNCjM7FFb55cXQxw ZEFdTkF8U9pfe9uYaVLflBo1OSYsiof71JllDsSgBpyJ90+bORy9mEDiG0otN1JxK/qT 2C8rreJW5VSwP0rPlxFb993oazSHx340A1Ba2TQsgJwTRx9YU6QQFwOV64n8GtOqt+2a +ZJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m9c/HJ7Sy0ScaPhRt42O0eYelD2BiaK2jTOgIvBXfFQ=; b=l3iu+6+kmrD/JZ23BbwihSl8OQXOJrBV8nuo2bCj0NhyGPZ4/8qypoJ8e+gc0+PLRI rcyzIHn0iIJZRgKAom2DNBJe47EhNXclM7uqfe1VzTMm03gmFphW0zv9Hs7cjC1RWqqC /melJ6y/oTVeEHIjIqLwJe2WDw+2PXq9Q029/ORm+y+UK6YGQQ3b3B1U51zbXF+NPq5k Ia5LO2zANYouFH0XDaiDFsLmFUPcaRSFFAEl+t8TOZdDYuiFAnoa3ruDnK0VHPmm6SFp Y9GBnVAWIBhZ9gV7uCu3nvf0XL51WzWuU4K186deSKYevNZ+yoWDFVyvDmk5H3p5uwuD JsUA== X-Gm-Message-State: AOAM5325T6eibV/cTyAM8y/FGqWcCjKEUm7lOONAe3+9y94cSPAf9agF Zzge3DR2/vt2bbHWxU1gCTuHa99Ty2AJDA== X-Google-Smtp-Source: ABdhPJyH37dQKgyy3S3wkUYY0kwyi8xGXTXFoWVV/nhcnMQHzb0aF5gPPVYfQX9TmpRHABd5VSDg9Q== X-Received: by 2002:a9d:68d7:: with SMTP id i23mr9012729oto.136.1622489564841; Mon, 31 May 2021 12:32:44 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id r85sm856569oor.38.2021.05.31.12.32.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 12:32:44 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= , Jeff King , Junio C Hamano , Felipe Contreras Subject: [PATCH v3 2/7] push: hedge code of default=simple Date: Mon, 31 May 2021 14:32:32 -0500 Message-Id: <20210531193237.216726-3-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210531193237.216726-1-felipe.contreras@gmail.com> References: <20210531193237.216726-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org `simple` is the most important mode so move the relevant code to its own function to make it easier to see what it's doing. Reviewed-by: Elijah Newren Signed-off-by: Felipe Contreras --- builtin/push.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index 06406353ce..48c38fe25a 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -223,6 +223,14 @@ static void setup_push_current(struct remote *remote, struct branch *branch) refspec_appendf(&rs, "%s:%s", branch->refname, branch->refname); } +static void setup_push_simple(struct remote *remote, struct branch *branch, int same_remote) +{ + if (!same_remote) + setup_push_current(remote, branch); + else + setup_push_upstream(remote, branch, same_remote, 1); +} + static int is_same_remote(struct remote *remote) { struct remote *fetch_remote = remote_get(NULL); @@ -242,10 +250,7 @@ static void setup_default_push_refspecs(struct remote *remote) case PUSH_DEFAULT_UNSPECIFIED: case PUSH_DEFAULT_SIMPLE: - if (!same_remote) - setup_push_current(remote, branch); - else - setup_push_upstream(remote, branch, same_remote, 1); + setup_push_simple(remote, branch, same_remote); break; case PUSH_DEFAULT_UPSTREAM: From patchwork Mon May 31 19:32:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12289925 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 BA17BC47082 for ; Mon, 31 May 2021 19:32:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E0D061260 for ; Mon, 31 May 2021 19:32:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232090AbhEaTeg (ORCPT ); Mon, 31 May 2021 15:34:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231985AbhEaTe2 (ORCPT ); Mon, 31 May 2021 15:34:28 -0400 Received: from mail-ot1-x330.google.com (mail-ot1-x330.google.com [IPv6:2607:f8b0:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29CF7C061574 for ; Mon, 31 May 2021 12:32:47 -0700 (PDT) Received: by mail-ot1-x330.google.com with SMTP id h24-20020a9d64180000b029036edcf8f9a6so12020003otl.3 for ; Mon, 31 May 2021 12:32:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iuHSOXaVNuPRkfSna9vWOqFx/khxAn9ZQMqAl0QnuJI=; b=IcmpTWH5z2zjua2mqEQ32pJvipWcBFjjZsSwFft0uYILckAFUIu8oBmTHxUOF3ZuS/ JEzNk6S24u/JrCa6U1S6gWBF7vfkjW9eCe/xf4xTHtXKQApOJSVt8INsf7QDbOe1Abyc OhFSvEEtAoZWbiPGi/V+IBLGrEoSVBIdwKmi1Notm9TZATHxnIfyxAepMzH/Rb5JvpVk +8ZIEKIGkHQxUFQvXrWdUKJs/BhqJRB+tnImjcPIP2sIHOjJWLcblzfTvQMh/el81Xyy 4nACunc8lkpg34qQ2lboQS4uZzsQL/eOEBAbUXElveyimA1jUr+vSROnF9sKpXlIw7Fq RLBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iuHSOXaVNuPRkfSna9vWOqFx/khxAn9ZQMqAl0QnuJI=; b=Bl5DHQBdmh9SspNvn68SHbTYSJ0NwTkgyR6X/0Sq4oKeUTX94xAAxpi507VBPGSjha na+kOJLJN/mqCKEweYB9Psk8tc14dgUhuzOv31hI+nTh1Vjo+h2y0MEYaa4KRqurAyrX atpYrOS8OPM1i8jBgKeNHQ9ypYQZZuKtlhguJvRKN1YHzaeyG5e8fYnzDqyYskkcD1Sz ky2nVCr0neQel0HJPEmgAOJ/5Fix8Sjj7E3fIPZYL5zcblDJnod26m1K8RnxdlEr+AGK eizOdu3u5IwPDZ4LHkcovPcWC6KAHxLpUIzKQceFphkmUbmJ8bWyei3Fe78v3sLB9eCO FkZA== X-Gm-Message-State: AOAM530NBb2A3NLUMB032C3eFcxTj9dQtm4qEt7rV9v7MClOR6+LaMj1 NS3L8OS1HQH7tFZaT77xpcKdm1nVo/zc9A== X-Google-Smtp-Source: ABdhPJxgckzuAQMDg6YVWKm3xPNARnlvi8EkIB4X5A0Hbm0DeMWuplisYItySURIKvfyL8V84amfDg== X-Received: by 2002:a9d:6244:: with SMTP id i4mr17507824otk.182.1622489566332; Mon, 31 May 2021 12:32:46 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id f80sm1924127otf.32.2021.05.31.12.32.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 12:32:46 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= , Jeff King , Junio C Hamano , Felipe Contreras Subject: [PATCH v3 3/7] push: copy code to setup_push_simple() Date: Mon, 31 May 2021 14:32:33 -0500 Message-Id: <20210531193237.216726-4-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210531193237.216726-1-felipe.contreras@gmail.com> References: <20210531193237.216726-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In order to avoid doing unnecessary things and simplify it in further patches. In particular moving the additional name safety out of setup_push_upstream() and into setup_push_simple() and thus making both more straightforward. The code is copied exactly as-is; no functional changes. Reviewed-by: Elijah Newren Signed-off-by: Felipe Contreras --- builtin/push.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index 48c38fe25a..6a620a90e3 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -225,10 +225,38 @@ static void setup_push_current(struct remote *remote, struct branch *branch) static void setup_push_simple(struct remote *remote, struct branch *branch, int same_remote) { - if (!same_remote) - setup_push_current(remote, branch); - else - setup_push_upstream(remote, branch, same_remote, 1); + if (!same_remote) { + if (!branch) + die(_(message_detached_head_die), remote->name); + refspec_appendf(&rs, "%s:%s", branch->refname, branch->refname); + } else { + if (!branch) + die(_(message_detached_head_die), remote->name); + if (!branch->merge_nr || !branch->merge || !branch->remote_name) + die(_("The current branch %s has no upstream branch.\n" + "To push the current branch and set the remote as upstream, use\n" + "\n" + " git push --set-upstream %s %s\n"), + branch->name, + remote->name, + branch->name); + if (branch->merge_nr != 1) + die(_("The current branch %s has multiple upstream branches, " + "refusing to push."), branch->name); + if (!same_remote) + die(_("You are pushing to remote '%s', which is not the upstream of\n" + "your current branch '%s', without telling me what to push\n" + "to update which remote branch."), + remote->name, branch->name); + + if (1) { + /* Additional safety */ + if (strcmp(branch->refname, branch->merge[0]->src)) + die_push_simple(branch, remote); + } + + refspec_appendf(&rs, "%s:%s", branch->refname, branch->merge[0]->src); + } } static int is_same_remote(struct remote *remote) From patchwork Mon May 31 19:32:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12289927 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 40A54C47082 for ; Mon, 31 May 2021 19:33:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 23CC8610A6 for ; Mon, 31 May 2021 19:33:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232136AbhEaTej (ORCPT ); Mon, 31 May 2021 15:34:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231994AbhEaTea (ORCPT ); Mon, 31 May 2021 15:34:30 -0400 Received: from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com [IPv6:2607:f8b0:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 927AFC06174A for ; Mon, 31 May 2021 12:32:48 -0700 (PDT) Received: by mail-oi1-x22c.google.com with SMTP id w127so13197899oig.12 for ; Mon, 31 May 2021 12:32:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B+BCF3IT0nEFbKTMJPcLmTGSY9/Y47S32otMkyAq6Bo=; b=fWBwaa7bW07LDOjcd+YhZdH9HEagaBJ02pxICxZH4ease3cqiXZBWfeBx5ZEcFHQAE CZtvRQ91FE1hqtmmqUQyCfa3GJwb+LAX1SkTMrra/2g9Q0ZaKC4fexnyjrEDnK9bRzoV VskNctCx+3KhE8JtlRB7KkPTkOJcaAq4Dq7kCuc6qZGsNvAC211sK0fs0kyPd+YeN3Mx fFwXnWaf9/OoQ2ayN1Iu5Nz2V22pr52zpC8T5eb5OnZPcewZAf9arf5lU8tq0Iu4F9gr zA1hLDEejyXKWqPJjhnJxXq/ECAgXG+RvjFAZxnYdrrtoSf9mzD41tE2AlzmE04QjUaR kCxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B+BCF3IT0nEFbKTMJPcLmTGSY9/Y47S32otMkyAq6Bo=; b=AHVf2p7XJH2uCHoppmS1BtpaNDXoJwG5gijAhkS27leoEAY5wcMJdvR9JYPuaaIcvO GNs6Q2d5N1uHD2Cj6DUNY2R+vP9ajAvUQEwa9hqrpyeTI2GM3yEUcsmAbWdFUOy2SlE2 2Jtk7A843klrCDROHzxUvBygK73qLdaxzFd/X4JxS3z6NKhbZ4YNzrD6geieicNpBe9+ z6nuvdWjJBNMLccXor2wOc+zaJFDcnLVgOR7Ffg1F9q1eYbn8lj35MkwXa9Zgh++TD96 NAsQl3rXguQLWbGVRANkjVgcfXUj9kV21gGeb57RHeu7nmuGTZxJsstlM/I5p//xeBuf PUYQ== X-Gm-Message-State: AOAM530HD8NTOcOYXUPG+283J4qukcd9ZLQmu+0UxFolwlxQvC0UA7Wp MfYb3sY1uqubPXSmftZUymnGWryNBccPwg== X-Google-Smtp-Source: ABdhPJzeypQ8ls6LQlHQN2oL+vivHesmXVQEm2Fs19Ghb/z7OsxUpcO2kuyXAZ+m5uLSnwHMXc/j4A== X-Received: by 2002:aca:c488:: with SMTP id u130mr15192266oif.0.1622489567778; Mon, 31 May 2021 12:32:47 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id x11sm3252561otr.36.2021.05.31.12.32.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 12:32:47 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= , Jeff King , Junio C Hamano , Felipe Contreras Subject: [PATCH v3 4/7] push: reorganize setup_push_simple() Date: Mon, 31 May 2021 14:32:34 -0500 Message-Id: <20210531193237.216726-5-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210531193237.216726-1-felipe.contreras@gmail.com> References: <20210531193237.216726-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Simply move the code around and remove dead code. In particular the '!same_remote' conditional is a no-op since that part of the code is the same_remote leg of the conditional beforehand. No functional changes. Suggestions-by: Elijah Newren Signed-off-by: Felipe Contreras --- builtin/push.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index 6a620a90e3..972d8e1cfd 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -225,13 +225,14 @@ static void setup_push_current(struct remote *remote, struct branch *branch) static void setup_push_simple(struct remote *remote, struct branch *branch, int same_remote) { + const char *dst; + + if (!branch) + die(_(message_detached_head_die), remote->name); + if (!same_remote) { - if (!branch) - die(_(message_detached_head_die), remote->name); - refspec_appendf(&rs, "%s:%s", branch->refname, branch->refname); + dst = branch->refname; } else { - if (!branch) - die(_(message_detached_head_die), remote->name); if (!branch->merge_nr || !branch->merge || !branch->remote_name) die(_("The current branch %s has no upstream branch.\n" "To push the current branch and set the remote as upstream, use\n" @@ -243,20 +244,14 @@ static void setup_push_simple(struct remote *remote, struct branch *branch, int if (branch->merge_nr != 1) die(_("The current branch %s has multiple upstream branches, " "refusing to push."), branch->name); - if (!same_remote) - die(_("You are pushing to remote '%s', which is not the upstream of\n" - "your current branch '%s', without telling me what to push\n" - "to update which remote branch."), - remote->name, branch->name); - - if (1) { - /* Additional safety */ - if (strcmp(branch->refname, branch->merge[0]->src)) - die_push_simple(branch, remote); - } - refspec_appendf(&rs, "%s:%s", branch->refname, branch->merge[0]->src); + /* Additional safety */ + if (strcmp(branch->refname, branch->merge[0]->src)) + die_push_simple(branch, remote); + + dst = branch->merge[0]->src; } + refspec_appendf(&rs, "%s:%s", branch->refname, dst); } static int is_same_remote(struct remote *remote) From patchwork Mon May 31 19:32:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12289929 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 A8B17C47080 for ; Mon, 31 May 2021 19:33:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 86AA7610A6 for ; Mon, 31 May 2021 19:33:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232062AbhEaTel (ORCPT ); Mon, 31 May 2021 15:34:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232006AbhEaTec (ORCPT ); Mon, 31 May 2021 15:34:32 -0400 Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29D01C061760 for ; Mon, 31 May 2021 12:32:50 -0700 (PDT) Received: by mail-ot1-x32f.google.com with SMTP id t10-20020a05683022eab0290304ed8bc759so11956268otc.12 for ; Mon, 31 May 2021 12:32:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NpAYWAyESuumExWro3QllGRKGVHZdpREMB1qPvfcFB0=; b=r19pGc5PpT+p6X6Ks8HwtNwKFWGjzHGi8b2xneTDwaNqG8gua4YGFW4kH+VE+srR9w /j7bTAVw+mtUd1dbdBi/N5Hzsx9saLIcmEh7zZU0lIHPkSM7Pv9hA7cVc0neAKK7nQ4V B5qTBDPWEZ17BemWU6ljHgZtFNK5A4GiY8YAFEtKxH6QkTcQRrrNKWL0uWArqDWLuYPc AnVsjcqoWnYJc4kBZeeYWzPNQUD8iQSFrN96QPq6Drpqah/3CAC6EkwFRmlVAqPA+KN8 q1M7C9edObIkhdlJJKRW5mdyunK5FSyT4bSA4zyw9MfPXcFeVktntk8uH+Mo35VrTVrB gUeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NpAYWAyESuumExWro3QllGRKGVHZdpREMB1qPvfcFB0=; b=ILYAlGqSCpoVVJSptZ10ZKHWWFsfzROj1cS2Okxw6n20yX9ctS+gpLxTPR4VSrz89T g84Mwz5tvCr5M0e0hJBC/3s85yrEfOEXMPfG5OFtaV/15a/ivf6ZO073fFp9p+7MzIXx MGR6pCMdBNhmjs5S6LApkc2tkHU3a3kzDh+PtjKCCktz/fkduNZPD/rnLwQYQW0TenBd 5058PS3/sIUzgbIZhLhlgPU0X2TynvGUffZ2MxRWE3OYSqdd8hVyUuN4Q1dDY6FKh7eF kIzD79RX1WPfJAz7el1pMXi3wsmn4htOrQlluR6DA9lBXTqs69GmjycoDKIEPuLQkjSC 6E2A== X-Gm-Message-State: AOAM530hPj/5unGyWHVEfGgo5C5Kj8tJuy/28QZjDDcPlqXmtv9qBSMb Bi9naQiZkWgkb8sKcxf0liimKDFgHanYMA== X-Google-Smtp-Source: ABdhPJzenE+tv4pj7b3f1VdLLblVBoxTLy5PJtFPDP2JbGjQucVFpRbmmWSFn6/xPgJROIRzcagqng== X-Received: by 2002:a05:6830:2412:: with SMTP id j18mr9588646ots.65.1622489569336; Mon, 31 May 2021 12:32:49 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id x31sm3262561ota.24.2021.05.31.12.32.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 12:32:48 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= , Jeff King , Junio C Hamano , Felipe Contreras Subject: [PATCH v3 5/7] push: simplify setup_push_simple() Date: Mon, 31 May 2021 14:32:35 -0500 Message-Id: <20210531193237.216726-6-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210531193237.216726-1-felipe.contreras@gmail.com> References: <20210531193237.216726-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org There's a safety check to make sure branch->refname isn't different from branch->merge[0]->src, otherwise we die(). Therefore we always push to branch->refname. Suggestions-by: Elijah Newren Signed-off-by: Felipe Contreras --- builtin/push.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index 972d8e1cfd..e37c751268 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -225,14 +225,10 @@ static void setup_push_current(struct remote *remote, struct branch *branch) static void setup_push_simple(struct remote *remote, struct branch *branch, int same_remote) { - const char *dst; - if (!branch) die(_(message_detached_head_die), remote->name); - if (!same_remote) { - dst = branch->refname; - } else { + if (same_remote) { if (!branch->merge_nr || !branch->merge || !branch->remote_name) die(_("The current branch %s has no upstream branch.\n" "To push the current branch and set the remote as upstream, use\n" @@ -248,10 +244,8 @@ static void setup_push_simple(struct remote *remote, struct branch *branch, int /* Additional safety */ if (strcmp(branch->refname, branch->merge[0]->src)) die_push_simple(branch, remote); - - dst = branch->merge[0]->src; } - refspec_appendf(&rs, "%s:%s", branch->refname, dst); + refspec_appendf(&rs, "%s:%s", branch->refname, branch->refname); } static int is_same_remote(struct remote *remote) From patchwork Mon May 31 19:32:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12289933 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=-12.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, USER_AGENT_GIT autolearn=ham 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 287C1C47080 for ; Mon, 31 May 2021 19:33:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0461661263 for ; Mon, 31 May 2021 19:33:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232080AbhEaTes (ORCPT ); Mon, 31 May 2021 15:34:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232043AbhEaTed (ORCPT ); Mon, 31 May 2021 15:34:33 -0400 Received: from mail-ot1-x334.google.com (mail-ot1-x334.google.com [IPv6:2607:f8b0:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB2F7C061574 for ; Mon, 31 May 2021 12:32:51 -0700 (PDT) Received: by mail-ot1-x334.google.com with SMTP id 66-20020a9d02c80000b02903615edf7c1aso11956503otl.13 for ; Mon, 31 May 2021 12:32:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ThdkgamF/ZZ4I+WkruSIFYBRX9tPYzooqx/S+C7HF20=; b=MPgFnPquYkQF15XCukY7gbuUG/yOUQIwA9potYN7NXG4ACRda1rN8oo2NFH6HJQWOZ L3ELdvk8qAwypWQm6+be3mlu01Ln8bnHJnyQL4QZ6IVUvbtCOz0zgAe57mBERgwxxawu DCKriWZwGVwHrYcJZaLeqEcrtbPUD6zIHpAm5STWQ2nUx5srNzG9fcTIyF05KVefjNcv KDau/78qlD1u98MDkus8eP1Y6kppNEOu17yTn73jrRKwxWsWU4rpW3iETUlCAygSn6yt t27mnkkisyS/zlY3L1IkFARxiReOJPJ8j0oLm/gainFGJctyKicYU/kleMcOTdAiXXFb vj5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ThdkgamF/ZZ4I+WkruSIFYBRX9tPYzooqx/S+C7HF20=; b=M5eNGNbpi25VGnurvMV+ydI1hK9i888jNunkC/uZYClBfsGw1ylYw7Z+jsSKiIvvC3 VHf30O1kHMecpeeyk25TXjfXGx3d65qKIYhL+GlNzVIQbSXNTBwI3ZTRyLUWXQnBv8aZ owt7WEAiZ1iR/xCL5FL9TrtDzgTIEsnjij9TOkNYimHtwJ8ezu9kquiwEqH1k+9GI6nt asjTR9mDAGNGcHNtqJzGsVZy6XNuynOjPInbdop+vC8HEezz+Neu3g260u4xTAmc+Bgl XMXcFcgkBtYCNrVfBi8vbiZba3a5FVtW+siiCACMx062rANDE+XLIF8E6a6tt9p2bQg0 DBkQ== X-Gm-Message-State: AOAM532Xxmda25NE1+bOrHjwQA7JmDt4Svd+dpY8nBspNEwI1+QIWuZT wXScHlC/FWXnMSDzKqroHs+OSyIt8vAxWQ== X-Google-Smtp-Source: ABdhPJyebuzugF75aOR9OaE84GTPDfl5rQ0D4vAwAJkMRCRVJLr+Mlod6AObYyOxM7msm1Y8hSGdtA== X-Received: by 2002:a9d:5c16:: with SMTP id o22mr467275otk.319.1622489570861; Mon, 31 May 2021 12:32:50 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id y7sm3258964oto.60.2021.05.31.12.32.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 12:32:50 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= , Jeff King , Junio C Hamano , Felipe Contreras Subject: [PATCH v3 6/7] push: remove unused code in setup_push_upstream() Date: Mon, 31 May 2021 14:32:36 -0500 Message-Id: <20210531193237.216726-7-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210531193237.216726-1-felipe.contreras@gmail.com> References: <20210531193237.216726-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Now it's not used for the simple mode. Signed-off-by: Felipe Contreras --- builtin/push.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index e37c751268..29fea70ff1 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -186,7 +186,7 @@ static const char message_detached_head_die[] = " git push %s HEAD:\n"); static void setup_push_upstream(struct remote *remote, struct branch *branch, - int same_remote, int simple) + int same_remote) { if (!branch) die(_(message_detached_head_die), remote->name); @@ -207,12 +207,6 @@ static void setup_push_upstream(struct remote *remote, struct branch *branch, "to update which remote branch."), remote->name, branch->name); - if (simple) { - /* Additional safety */ - if (strcmp(branch->refname, branch->merge[0]->src)) - die_push_simple(branch, remote); - } - refspec_appendf(&rs, "%s:%s", branch->refname, branch->merge[0]->src); } @@ -271,7 +265,7 @@ static void setup_default_push_refspecs(struct remote *remote) break; case PUSH_DEFAULT_UPSTREAM: - setup_push_upstream(remote, branch, same_remote, 0); + setup_push_upstream(remote, branch, same_remote); break; case PUSH_DEFAULT_CURRENT: From patchwork Mon May 31 19:32:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12289931 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 89DD3C47080 for ; Mon, 31 May 2021 19:33:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6A49061260 for ; Mon, 31 May 2021 19:33:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232132AbhEaTeo (ORCPT ); Mon, 31 May 2021 15:34:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232023AbhEaTed (ORCPT ); Mon, 31 May 2021 15:34:33 -0400 Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C523C061760 for ; Mon, 31 May 2021 12:32:53 -0700 (PDT) Received: by mail-ot1-x329.google.com with SMTP id r26-20020a056830121ab02902a5ff1c9b81so11969112otp.11 for ; Mon, 31 May 2021 12:32:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/rM4o5LYGmIaS5Qh2mpF1UAeKj6J8HLsjfYpcVhBPbk=; b=MqR7Jxu7/YT2RjWDYq3D7LOHL3b55g4HXUXOUA6TPBTnPxedacDVfOjR7sBPzc/Bod IvmlJ1MVwUMqN90cvrKeeH8z+7xvGyUq3uAjSDB8k/2LGxVJabweyLNEaz/iWq3jGoXl znyjFPrvr5luCWxHwPEwwe43vAJzT3PPStOzeDDyUJjk7hSZnVUW57ViRIcLl3edWP4V XZAFLPG8FyDlE7GD9qHAiD06AAVXPP9U6wN+4zeyo+yvkbjuMz+im291nM1r7hAIqYJE KEZjk1szYv96q47gflyHzfijpSUMH3gw3SEnRNB8JKpTmC21HHjZz5F1sD/HXLe6ELEW gyHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/rM4o5LYGmIaS5Qh2mpF1UAeKj6J8HLsjfYpcVhBPbk=; b=LkRNSbgP7VoWWpVH2AbXzFGNEVj8GKns4BriCVKsMv4LLf+UhDA3sk+rNj/1gq2K7Y 9sjY3J/8/+O+F5WtyRW53dEoJi1o4m6b0zWfkjK1sIvKP0qs66/a1zaT9EzcmMPVdh8B 6MyFbBOP6EL3D9NZmomIb6Q3CGin+BJQZnR3foo1Al3H0VjrP0fDfVOZJeQUc8vmZVIT EDw7i4z5KCsdt4LnrqKy0iKWB1oWYCjqzA9GQxFVHVnMbzOvwI/M2F6ClxM1w+PBndm5 EEz41RVAdiE8Mi2o66ilSWU80pqp/WYuOliFKXpVvWCxVUROcBZBhfH6s8pIjFWnKs3K KaPA== X-Gm-Message-State: AOAM532mUgjqb76xtc+nVr2+02lsKTziMeSOmTef1Ejm0f7vokVhI9yU tPyfjRSoGQpqcV22BaEgbx0RdH2fqxkrnA== X-Google-Smtp-Source: ABdhPJyc0VY9etvLfrjNHl6aSQeN0VeL9LdAY4v190VuN9CJDUiPwHCUzXTjS8tYIa3lxPpVxNSwPQ== X-Received: by 2002:a9d:7a56:: with SMTP id z22mr18423765otm.47.1622489572560; Mon, 31 May 2021 12:32:52 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id 1sm1784854otg.40.2021.05.31.12.32.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 12:32:52 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= , Jeff King , Junio C Hamano , Felipe Contreras Subject: [PATCH v3 7/7] doc: push: explain default=simple correctly Date: Mon, 31 May 2021 14:32:37 -0500 Message-Id: <20210531193237.216726-8-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210531193237.216726-1-felipe.contreras@gmail.com> References: <20210531193237.216726-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Now that the code has been simplified and it's clear what it's actually doing, update the documentation to reflect that. Namely; the simple mode only barfs when working on a centralized workflow, and there's no configured upstream branch with the same name. Cc: Elijah Newren Signed-off-by: Felipe Contreras --- Documentation/config/push.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Documentation/config/push.txt b/Documentation/config/push.txt index f2667b2689..632033638c 100644 --- a/Documentation/config/push.txt +++ b/Documentation/config/push.txt @@ -24,15 +24,14 @@ push.default:: * `tracking` - This is a deprecated synonym for `upstream`. -* `simple` - in centralized workflow, work like `upstream` with an - added safety to refuse to push if the upstream branch's name is - different from the local one. +* `simple` - pushes the current branch with the same name on the remote. + -When pushing to a remote that is different from the remote you normally -pull from, work as `current`. This is the safest option and is suited -for beginners. +If you are working on a centralized workflow (pushing to the same repository you +pull from, which is typically `origin`), then you need to configure an upstream +branch with the same name. + -This mode has become the default in Git 2.0. +This mode is the default since Git 2.0, and is the safest option suited for +beginners. * `matching` - push all branches having the same name on both ends. This makes the repository you are pushing to remember the set of