From patchwork Fri May 28 20:10:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287469 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 D69B8C4708C for ; Fri, 28 May 2021 20:10:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A34B5613B5 for ; Fri, 28 May 2021 20:10:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229603AbhE1UL5 (ORCPT ); Fri, 28 May 2021 16:11:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229541AbhE1ULz (ORCPT ); Fri, 28 May 2021 16:11:55 -0400 Received: from mail-oi1-x230.google.com (mail-oi1-x230.google.com [IPv6:2607:f8b0:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01D1BC061574 for ; Fri, 28 May 2021 13:10:19 -0700 (PDT) Received: by mail-oi1-x230.google.com with SMTP id c196so5393536oib.9 for ; Fri, 28 May 2021 13:10:18 -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=0hCv/FjSrqMI+WjTMTsnoXucijauBgpZ7Q92ug0DN54=; b=GNK1ZCfKJcwOJgVF6fyN+c6+d5A1dWQLiCKxXAhiDuTvX4CZ7Rb2PFZ69qmLoCMgvy jkZQiohrzoM9gWt6nU8ihfk5zz1dZIZqdLbF4Ng1qOmOROjxosqHXQn0wt/yrlyhZLGF 87LIi7SZpfVfzdJ3c1shjM/eQ1BQzDm6mQa5UeWaFA07ZOmtH+LHV7ZrqnjmufTxsoAA Ji+ugGrKqrW213lJuy+QemlweNFC8EgO9qriWi25+1BBtDgjLLNXM+46uMjkt7sUt18x gCZPtc4lGmNVHUr/M5n8L7yN8gODggUfnuAUAvkKF0afGPWEXhixqrbWNK7LA0nDeOfC /LQA== 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=0hCv/FjSrqMI+WjTMTsnoXucijauBgpZ7Q92ug0DN54=; b=jnRqKPYvApnHHrbqxZq0f899zKJVDAqfDQmEl4O0R8bGhT3AzZr5N9YjISpFis8k/3 pcn9XBdqqk0IiaL2jwp7aEFQSxz8XneJaPbeUdkkHBcNYD9XK7XfkAPP84CuuAm4neJS 6iEDEm+Wvn3cjHcUPjFau2EJRqW+IprDvFe3YlcEGikvbiuul2gTEXB45AhC94XvV8kQ vuI1y+VnrF0G4oEYZ+y0KidNdyaOWDkPWKBsf3uyDAAdoIz69lJfsbt1nZKNnD+IFmny Q/MeO2A1VE6/PlJ8vNTXaiuyNqGv2UN15HA9gDUOUYal6VMJ99m1V8j9lWHnzquYBsPE a6Ow== X-Gm-Message-State: AOAM531/09rOV/Ls6KLXLftTDJRvPLq1uftGuNIJrQdNj9vvHjk+r3lf bTtqaYOhSwxH1KhfJx0Cl5RGAKEzPTVBrA== X-Google-Smtp-Source: ABdhPJx2IeOXoEfy4hzRqanHsgRVTQ5IlZQNEgXc+IY7deF3nDRf4Kqs2tO2+DK7gf3uBbexAbdZMQ== X-Received: by 2002:aca:1a06:: with SMTP id a6mr6875408oia.95.1622232618165; Fri, 28 May 2021 13:10:18 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id k20sm1371182otb.15.2021.05.28.13.10.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 May 2021 13:10:17 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Mathias Kunter , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7AgQmphcm1hc29u?= , Ramkumar Ramachandra , Jeff King , =?utf-8?q?Ren=C3=A9_Scharfe?= , Matthieu Moy , Junio C Hamano , Felipe Contreras Subject: [PATCH 01/11] push: hedge code of default=simple Date: Fri, 28 May 2021 15:10:04 -0500 Message-Id: <20210528201014.2175179-2-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210528201014.2175179-1-felipe.contreras@gmail.com> References: <20210528201014.2175179-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. 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 194967ed79..7045e4ef0c 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 triangular) +{ + if (triangular) + setup_push_current(remote, branch); + else + setup_push_upstream(remote, branch, triangular, 1); +} + static int is_workflow_triangular(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 (triangular) - setup_push_current(remote, branch); - else - setup_push_upstream(remote, branch, triangular, 1); + setup_push_simple(remote, branch, triangular); break; case PUSH_DEFAULT_UPSTREAM: From patchwork Fri May 28 20:10:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287471 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,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 9E6EDC4708C for ; Fri, 28 May 2021 20:10:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 791196108E for ; Fri, 28 May 2021 20:10:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229632AbhE1UL6 (ORCPT ); Fri, 28 May 2021 16:11:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229585AbhE1UL5 (ORCPT ); Fri, 28 May 2021 16:11:57 -0400 Received: from mail-ot1-x32c.google.com (mail-ot1-x32c.google.com [IPv6:2607:f8b0:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92E67C06174A for ; Fri, 28 May 2021 13:10:20 -0700 (PDT) Received: by mail-ot1-x32c.google.com with SMTP id p24-20020a05683019d8b0290399e8a3aa60so102991otp.7 for ; Fri, 28 May 2021 13:10:20 -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=4UWKu6cp+G2Etnoa18VCXade1cftECju3TqEKmznjBM=; b=YQnAHys36V7a6O5+g+piuiilIjbaw+Al8X0/2J5eLKFyJB2wu5qR/ZFCr2himWAw5l +TbhVNcaClcaqldAD5GmKJmERBJtVXmcLPq/suXWhmc22Uxw0xOs7O7cqABECHfdvlah hioWtRxp6P7MyEV+4p3xqPs64N4jAJ7OqJ6JGfNZkq7Y/MHbbKWxhf0bat0ZHn0RWOq7 BtTx4pIWn7RijzI1AJJxR7ZILK9OjCxoIWDQsaFrnUANAFabilUpmqI2IPePV06F15oC 5UkzVT45+vS/lgSti2HInDkRby9MHv0i8w1Ud+cXMHW3PnE2PHnOG8MF+np9/T1I+Akn Q4ew== 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=4UWKu6cp+G2Etnoa18VCXade1cftECju3TqEKmznjBM=; b=B1UAZVs7X1bpMfBjLnl3j2o3Ar9wJMAnx3nSu5vK2Fgbz3zZUxKhWQceGoOq6MZfuo 9JksY76y/VaiFO9DoUdOThp7rkaWDALIMWOiP2Z0tZ10bD8mgtj2wN7Xs4JqSG3/dGO1 hXTS3oh8SopEkk9zryFvY9IJKs9rm0Pyavku+bBcGfxK++lmuo4QuHrnrnJgNm1hSSrR rSOlaCvWlF8pDHvbPSu+Gfo1AWBylt2j9LwsrM0DlFJQfo7t3Z2DGMuE0PujB9o907+2 FB1wKYV8R0B770Y7RKkZdUyyv4wPBK0VncWzpXtqydGNvh/f/9Bxf1kkpERKMbUbvD0s Wt1w== X-Gm-Message-State: AOAM53360QwZRu+R0U9aiyCsSQTJiDrmseUjek+me5bPsm3EUzrTIdVw U4BIOi/NZqHkKLCYmrnFlchCLyxnkZ5GLA== X-Google-Smtp-Source: ABdhPJwtgyFAgaVZvC3NGi28odRjEaHkfDoo7r+FyTPjhnTUN3EZbxRfoFd9dD8aEr1cYGLBJtMYTw== X-Received: by 2002:a9d:459a:: with SMTP id x26mr8333746ote.337.1622232619743; Fri, 28 May 2021 13:10:19 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id z6sm1328273oiz.39.2021.05.28.13.10.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 May 2021 13:10:19 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Mathias Kunter , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7AgQmphcm1hc29u?= , Ramkumar Ramachandra , Jeff King , =?utf-8?q?Ren=C3=A9_Scharfe?= , Matthieu Moy , Junio C Hamano , Felipe Contreras Subject: [PATCH 02/11] push: move code to setup_push_simple() Date: Fri, 28 May 2021 15:10:05 -0500 Message-Id: <20210528201014.2175179-3-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210528201014.2175179-1-felipe.contreras@gmail.com> References: <20210528201014.2175179-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. The code is copied exactly as-is; no functional changes. 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 7045e4ef0c..d173c39283 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 triangular) { - if (triangular) - setup_push_current(remote, branch); - else - setup_push_upstream(remote, branch, triangular, 1); + if (triangular) { + 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 (triangular) + 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_workflow_triangular(struct remote *remote) From patchwork Fri May 28 20:10:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287473 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,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 A9FBCC47087 for ; Fri, 28 May 2021 20:10:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8DE93613B5 for ; Fri, 28 May 2021 20:10:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229684AbhE1UMC (ORCPT ); Fri, 28 May 2021 16:12:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229607AbhE1UL6 (ORCPT ); Fri, 28 May 2021 16:11:58 -0400 Received: from mail-ot1-x331.google.com (mail-ot1-x331.google.com [IPv6:2607:f8b0:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D5D9C061574 for ; Fri, 28 May 2021 13:10:22 -0700 (PDT) Received: by mail-ot1-x331.google.com with SMTP id i12-20020a05683033ecb02903346fa0f74dso4595219otu.10 for ; Fri, 28 May 2021 13:10:22 -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=m4Pp7knWGKefDcDmCwRKPGBRc/O3oKMdEFwnvw+he10=; b=QVcEwjbTnLzalKC88kuE6qe5VakCdQWQm7iwS80tzi5QycXIMRnJMSxKfS4hP6hFlG FcPkQzmmr6tM+GV9kRAUgf787zhphU8qLDjEk7r3w+cBv1o5mZa08WCJThl8ZteTZp0L w+i78SMT6cR8p/U2NDQOgABDpikvD+9zsJMO2n5wHppLJVxYU2ISqQmDi0zybRuMPw9F i3ePgk5c9p2gNnHOzOeXrgwUptbkyiqw7suzUzzXcLL+qTtjxI+kXnVABSKfuqGSXNzB slUE4ux8MkI+4rKJFNbi5/6hcbqfmz5oGlBhtY4jXmqnM9mFBPFGfOOdYos2ssCmo8+y PF0A== 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=m4Pp7knWGKefDcDmCwRKPGBRc/O3oKMdEFwnvw+he10=; b=Co6f8mh+UHggBzm4PHd8D0YFKPgMx5n/FOjAxHC0fpIyZCgQz6wIkxmtYKoBjkfVhW +bMVoyTr0CxPUqngYzIIdw9ujqHy+B5RLhrmjf0TBtuVumm93++Z3jLy9qx2U4RMfDkl gA4403XmaZgQS3LAE7J7tTCy2sx/5GjgZZLlDt66AZxYwds7FqiqI+HhcAOUUjxa3pAl MXEBtVQyA2/cHaTZzS/agAWdFiTO+LieJpBxLmVxSBL88Qe+h1sHT9f1BShED5lwX0r+ VTqmdFZBZZsF9lQD/2obuRB9UVPudBlDM1vtimq1xFnQYUOtb3p9p0CNxDGchQT2Y2SN /6/w== X-Gm-Message-State: AOAM533bw6donTsqKMzVzWUgMo4P4aQ8ggS+ZdeqrY5Z+ka3fDe1rrxG 7js1CSQ4WffyzwoCkxvYcjHMsIC1FGa8qQ== X-Google-Smtp-Source: ABdhPJwqqfZrZ/PQa3IZ/lvbKnTfiPKZnwc9tyys94kf9y7XEt0cwUtltfLGN9lbdElSseWNFEJoCg== X-Received: by 2002:a05:6830:12d6:: with SMTP id a22mr8680939otq.66.1622232621259; Fri, 28 May 2021 13:10:21 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id x9sm1318838oto.79.2021.05.28.13.10.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 May 2021 13:10:20 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Mathias Kunter , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7AgQmphcm1hc29u?= , Ramkumar Ramachandra , Jeff King , =?utf-8?q?Ren=C3=A9_Scharfe?= , Matthieu Moy , Junio C Hamano , Felipe Contreras Subject: [PATCH 03/11] push: reorganize setup_push_simple() Date: Fri, 28 May 2021 15:10:06 -0500 Message-Id: <20210528201014.2175179-4-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210528201014.2175179-1-felipe.contreras@gmail.com> References: <20210528201014.2175179-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. No functional changes. 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 d173c39283..9c807ed707 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 triangular) { + const char *dst; + + if (!branch) + die(_(message_detached_head_die), remote->name); + if (triangular) { - 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 (triangular) - 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_workflow_triangular(struct remote *remote) From patchwork Fri May 28 20:10:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287475 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,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 9B1E6C4708C for ; Fri, 28 May 2021 20:10:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 765F96108E for ; Fri, 28 May 2021 20:10:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229656AbhE1UMD (ORCPT ); Fri, 28 May 2021 16:12:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229621AbhE1UL6 (ORCPT ); Fri, 28 May 2021 16:11:58 -0400 Received: from mail-oo1-xc2f.google.com (mail-oo1-xc2f.google.com [IPv6:2607:f8b0:4864:20::c2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DEBBC06174A for ; Fri, 28 May 2021 13:10:23 -0700 (PDT) Received: by mail-oo1-xc2f.google.com with SMTP id j26-20020a4adf5a0000b029020eac899f76so1208919oou.7 for ; Fri, 28 May 2021 13:10:23 -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=Y6E3jwfyxvztmmKlwDcEESjllAMSZL66YuaKO1v1Tr8=; b=TeErNd7g83EgF8GwNuLMrdMKW3Xa1H2a3BYdxiCluh5vAltYVe46QFKU7ymGEtvylI zgEyyOM6HVzcI2Zv/HqIVNjQeWhvvNQkyP/ifTmgIpjWfVYugQkTZIoEac18wIWwxecT KB8KxChjvf0f9hCkDEqz7yyedU+Q5gfzPg+2D4WWEKxiHvr3Jz4wTBi0B17OvYgqX7fL VVdRgWmGx8J22Ra99oMWPNuf3KlnrbcIBAMKQ8qEwSbn08jNIXHqXV5qLYZDucfMe5cK TPYCNYJv96tQsyrTIl/j9gFEc+OySV4otXLSmOIL7SBUriPtEGwCvZx+KiQhGZY67upW Ar8w== 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=Y6E3jwfyxvztmmKlwDcEESjllAMSZL66YuaKO1v1Tr8=; b=A1YQDGa6UhFRX0PkrOrCt87/eAWJ06zpggkmykGgUz6O+eciv5guPXfPqWV6Zw5ehH pJGIgedCiNyI9X/ctT+aziARkj9CvmNB04HedrLPyr2VwAOO90c2Z6nVeDOrs61rKbSb fvPnVLgZv2t6ClurGjzrTFZYKKMuo8X2eeV9sWnC0XerLxhsPI/fd+C0ZEgVdjkjAAf1 9oEkenyyaSXuCQ89CjkFT2Gq10uvS2WnUgxXPy0518A+kSpYyYIq6eupnxtk2A+rTgt5 mVWykf7CwtS4gdSc+QXUunHPB5AlGSmEejHWwT9i+7SsAuUsWlbEQXT9uPtlIfxfuS6/ ErCQ== X-Gm-Message-State: AOAM530DA/2q4KICKpYqC2fh50L3FDovfif78Ooy5iF5v2QeSfSNAbx7 gpC/0fAdwdp/Qi+OoiAPSH/R2LsAgJKxuw== X-Google-Smtp-Source: ABdhPJy3M45mQs2YraIrGsmISFcqAvZaJk6F/2giBfSrSQ4fKBl3PxlUaydtUnm4V4FXBQOBPQCn1w== X-Received: by 2002:a4a:dc4e:: with SMTP id q14mr8430093oov.43.1622232622645; Fri, 28 May 2021 13:10:22 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id c32sm1291284otu.13.2021.05.28.13.10.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 May 2021 13:10:22 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Mathias Kunter , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7AgQmphcm1hc29u?= , Ramkumar Ramachandra , Jeff King , =?utf-8?q?Ren=C3=A9_Scharfe?= , Matthieu Moy , Junio C Hamano , Felipe Contreras Subject: [PATCH 04/11] push: simplify setup_push_simple() Date: Fri, 28 May 2021 15:10:07 -0500 Message-Id: <20210528201014.2175179-5-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210528201014.2175179-1-felipe.contreras@gmail.com> References: <20210528201014.2175179-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org branch->refname can never be different from branch->merge[0]->src. 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 9c807ed707..73fe083682 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 triangular) { - const char *dst; - if (!branch) die(_(message_detached_head_die), remote->name); - if (triangular) { - dst = branch->refname; - } else { + if (!triangular) { 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_workflow_triangular(struct remote *remote) From patchwork Fri May 28 20:10:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287477 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 E2C51C47087 for ; Fri, 28 May 2021 20:10:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C0EE76108E for ; Fri, 28 May 2021 20:10:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229695AbhE1UMG (ORCPT ); Fri, 28 May 2021 16:12:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229674AbhE1UMB (ORCPT ); Fri, 28 May 2021 16:12:01 -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 31F6DC061761 for ; Fri, 28 May 2021 13:10:25 -0700 (PDT) Received: by mail-ot1-x330.google.com with SMTP id i23-20020a9d68d70000b02902dc19ed4c15so4658099oto.0 for ; Fri, 28 May 2021 13:10:25 -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=hCVlMZmaZD9qdqc84YY4Mycvu+XQsMSNAHihq6hja7o=; b=UK0yDG639t91cIhVAIXFpRqgYVPt5ULHygfkATKGTqbUUr9a9ThoTLOrRjgSjw5h8Q eGZoOBmk6ZPdttnv45yNMzpzwr4PxExeboDayfmQ3/mvNUgVdYXTh89zsNRHJQJw9P2U ZT+FnTIL5ewM9eSVRBjKmZEqXRajORopIMwwKfzYzlksPSJWiocg9flK/qtZGmVEdluJ 3OjD8/itYEYzUzIc65f5UONfyyCYBFC8GFSwF8UMwvH1BRGrDMeDsQ2CjKg/McMN5Pbr xeyMkXD/hFwMvec3WqVdrmzbZAqidKuU6ArULtIYBn7TZsY5rDly6k2cKWSijB1CNjBt evdQ== 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=hCVlMZmaZD9qdqc84YY4Mycvu+XQsMSNAHihq6hja7o=; b=k1FUXXKrtG1W8/hsx55PeBEYRugL19Q+BVxMiCCzkrkg3w6SaQPliXD2eYXV6TJl/L HMXEaahxsIsfefNqr90luWNswqyWXI03x2+FeeWHmL96D47msoWPAxs2u3qK4cW/38fq FN7e/0zLRbCsK/nZaunXjsnMBssMRgpGMNYCQ42dIMU7J24FPuPbAzoTGPUwL+b1BG23 F9jj7YbARl10YK/yPH7tI4FEMJ/2czRbsaEyGAfLpTKeaif6Yxr2+Yqn3psLRpoOPoXW jZMxx+9wuXG2zXACEd2g5GUF/zpLeFuy7OJGLmaDhaZRmg5469l2CWcifxT25HXCYzA8 2u7A== X-Gm-Message-State: AOAM530mD0V2+C8m9yyr4+aFbIIRUipUR/isj0FqQM8nRLAEgD75+8uK BSCZyCifnVW8U7cAWietIQc+DnyfGrHgbQ== X-Google-Smtp-Source: ABdhPJxngiw6l3Ynma3FHUB8B95t1twcoxhMcMAiOUjTNYYTb88JHPAJSuL2WJd4h3g1XLhZ1u3LZQ== X-Received: by 2002:a9d:453:: with SMTP id 77mr8778749otc.31.1622232624357; Fri, 28 May 2021 13:10:24 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id f21sm1330981oou.24.2021.05.28.13.10.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 May 2021 13:10:24 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Mathias Kunter , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7AgQmphcm1hc29u?= , Ramkumar Ramachandra , Jeff King , =?utf-8?q?Ren=C3=A9_Scharfe?= , Matthieu Moy , Junio C Hamano , Felipe Contreras Subject: [PATCH 05/11] push: remove unused code in setup_push_upstream() Date: Fri, 28 May 2021 15:10:08 -0500 Message-Id: <20210528201014.2175179-6-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210528201014.2175179-1-felipe.contreras@gmail.com> References: <20210528201014.2175179-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 73fe083682..0961826269 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 triangular) { 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, triangular, 0); + setup_push_upstream(remote, branch, triangular); break; case PUSH_DEFAULT_CURRENT: From patchwork Fri May 28 20:10:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287479 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 EFCD8C4708C for ; Fri, 28 May 2021 20:10:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D1E506108E for ; Fri, 28 May 2021 20:10:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229721AbhE1UMJ (ORCPT ); Fri, 28 May 2021 16:12:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229607AbhE1UMD (ORCPT ); Fri, 28 May 2021 16:12:03 -0400 Received: from mail-oo1-xc2c.google.com (mail-oo1-xc2c.google.com [IPv6:2607:f8b0:4864:20::c2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C381FC061760 for ; Fri, 28 May 2021 13:10:26 -0700 (PDT) Received: by mail-oo1-xc2c.google.com with SMTP id s20-20020a4ae9940000b02902072d5df239so1214841ood.2 for ; Fri, 28 May 2021 13:10:26 -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=oVunPFTMfKkZWGEj5e5Bc6uT5hg2dJmu1Igf5ckFvH8=; b=pJoPJI9OkipiqhxAtCuHC2yGETXR/970w4P+ibnsqgLO18+M6gFUrpITokLfaNkTon +nkrHExFGXHzhKFx+j60PmOoopie6gOborlnap58Kp1r8OpzkP8M1CvIAEtAyviu6iPS eg8vZlitJQ9huH6tqtkWJAVka3Jb/ooe7l9xQ2XtXCkA2xd3l7dAER1Wqr2sTvcICfWR tW227ph4ShdO3Jir1gj3sLR1F8v0PoTiFqB1hmpGc0/VKJipv5FwU+z9w3Gtq/x5TvXz KYFssh4M59TwnR0lijgzJX9FoStLSe+jszWki1e/KtUUhLSGi1Bp3R6NFxQlym+XEStM f0NQ== 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=oVunPFTMfKkZWGEj5e5Bc6uT5hg2dJmu1Igf5ckFvH8=; b=MRDAcAZ4qxGsV/gFiSKmm8fupXgYOCCtxXqDv043GJQHFIbyULhJhVudfQM49flNxd GH/xjS6sFml/SPG2bsDXCvP3xVTiMa0JH1tj3cU/Q9+HsGz/ory0M3Cukqw1ClIRTGvf BFpODMyYcJYIdiYu/7pJI+ffMSo1waMJJxEcn8u4kDB1aUkSNi+qfolEHeKugUm16ew+ FEI+R3iwULo5rGCvyx+Ud5BV8jFM7O8BmszvGl/Gfb3HOSTFaVMubd2qJoz2WGoFjypz wXgqlPmovRBwbbkuFPRP+h9lfjgOJlZxSdo0eV4T+rwVcpgoU6aCZctlUwbpSTrbRF5I FMUg== X-Gm-Message-State: AOAM530+ivME0K0AYuncC12b1yUVmrKggE+CkQ0LNcXQQ9Gh3098iKyL ejXzDt9jcGgVLyOZL+r+NZh7o5+HjkJHdw== X-Google-Smtp-Source: ABdhPJyyY1wBgyHOkOhtwoGbIEqyu0/R3HhD+Xo8WBYMUgSP5I0xP6WoQCFC7dC2gH18YPvaPFWIjA== X-Received: by 2002:a4a:85ca:: with SMTP id u10mr8292830ooh.80.1622232625936; Fri, 28 May 2021 13:10:25 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id l19sm1368844otk.65.2021.05.28.13.10.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 May 2021 13:10:25 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Mathias Kunter , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7AgQmphcm1hc29u?= , Ramkumar Ramachandra , Jeff King , =?utf-8?q?Ren=C3=A9_Scharfe?= , Matthieu Moy , Junio C Hamano , Felipe Contreras Subject: [PATCH 06/11] push: merge current and simple Date: Fri, 28 May 2021 15:10:09 -0500 Message-Id: <20210528201014.2175179-7-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210528201014.2175179-1-felipe.contreras@gmail.com> References: <20210528201014.2175179-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org `current` is basically the same as `simple` except always assuming we are in a triangular workflow. Signed-off-by: Felipe Contreras --- builtin/push.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index 0961826269..2d6358f776 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -210,13 +210,6 @@ static void setup_push_upstream(struct remote *remote, struct branch *branch, refspec_appendf(&rs, "%s:%s", branch->refname, branch->merge[0]->src); } -static void setup_push_current(struct remote *remote, struct branch *branch) -{ - if (!branch) - die(_(message_detached_head_die), remote->name); - refspec_appendf(&rs, "%s:%s", branch->refname, branch->refname); -} - static void setup_push_simple(struct remote *remote, struct branch *branch, int triangular) { if (!branch) @@ -269,7 +262,7 @@ static void setup_default_push_refspecs(struct remote *remote) break; case PUSH_DEFAULT_CURRENT: - setup_push_current(remote, branch); + setup_push_simple(remote, branch, 1); break; case PUSH_DEFAULT_NOTHING: From patchwork Fri May 28 20:10:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287481 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,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 F210DC4708D for ; Fri, 28 May 2021 20:10:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CED35613B5 for ; Fri, 28 May 2021 20:10:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229731AbhE1UML (ORCPT ); Fri, 28 May 2021 16:12:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229691AbhE1UME (ORCPT ); Fri, 28 May 2021 16:12:04 -0400 Received: from mail-ot1-x32e.google.com (mail-ot1-x32e.google.com [IPv6:2607:f8b0:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73AE8C061574 for ; Fri, 28 May 2021 13:10:28 -0700 (PDT) Received: by mail-ot1-x32e.google.com with SMTP id p24-20020a05683019d8b0290399e8a3aa60so103290otp.7 for ; Fri, 28 May 2021 13:10:28 -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=MND7CxXkCpWVTkvEAF445hC0TfdUYtEVoVLeQZV/beU=; b=Nv6O9otp6vzbafN3Bs1pi3eTcalS6azvGZFiCvUI/dGvdnY5wj+s6sPGKWX2etjEIP dm1JVsYwt/6C80Dgq6P+krZuSEBN9NMEUsfPKB/TKKF4bnFZ/b8UQOAcq7inbQ7/UCMh mKO4mXJ/39qiTBQVPgUTok06OGKHh7lw76oeSwRSD93LUMvClkf2FV7GSJYLInrrfEE8 FP4lDBwYdP7lC8OLp/7iQMPTj7ESacKQAnyl9Vxh1i4F0O0AuGPkyenwKxsXU1eHa9BZ Am6qmMBTBzV6gkB8jwfbHgvzX4iBGY28UupKoPaa36WxbStJ8oQy0zqE1ugasoLOD80g b/PA== 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=MND7CxXkCpWVTkvEAF445hC0TfdUYtEVoVLeQZV/beU=; b=oyFZLc1vMtH/3gaiQNGNGLDxCgC206F8zOqA1zqQv0+3o3Iapg9RsKW8RaAiE9qL66 cDVjft268/y7rcjPQCfLTkIUfPBQOh9YMA+dwW1d4ojTnFCMCLGxcNh90GZbCksz2aHb scCPSvnJl1OBdVZKn5yQ9oqFWfLtnIYp2apLn7OGRh9+hIUgIa95OsT1oF7zhiPd+qsS XWItoNZB4rfkedeP3BbhHBXe4ERkk5zyZlmOLSufizHeiQnN/tV26PGXrDx1INlGRwNT yOZyUwtIAPBA8/uimgWmCKWZKSWsHCDWn65jZg5pwaz1K09TVSPzRWAZ15JlusiYKKwq bKSQ== X-Gm-Message-State: AOAM532f0OUXyqSZNbS3XPupkQaL9XeH2x3Ilfs5mOpZFX/V1/vkw1RS tSbh8NRflEtDoDQuGJ9KOPo92cGG5Rh5LQ== X-Google-Smtp-Source: ABdhPJwqyFtpqOGlryJx1yQ6GhGwRCALBshpdpLea0QKz8sTQn6OLeSeAhKxDLYEhsHlILbiZgNEpA== X-Received: by 2002:a05:6830:22d3:: with SMTP id q19mr8520732otc.258.1622232627611; Fri, 28 May 2021 13:10:27 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id b18sm1335517otk.62.2021.05.28.13.10.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 May 2021 13:10:27 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Mathias Kunter , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7AgQmphcm1hc29u?= , Ramkumar Ramachandra , Jeff King , =?utf-8?q?Ren=C3=A9_Scharfe?= , Matthieu Moy , Junio C Hamano , Felipe Contreras Subject: [PATCH 07/11] push: remove redundant check Date: Fri, 28 May 2021 15:10:10 -0500 Message-Id: <20210528201014.2175179-8-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210528201014.2175179-1-felipe.contreras@gmail.com> References: <20210528201014.2175179-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org If fetch_remote is NULL (i.e. the branch remote is invalid), then it can't possibly be same as remote, which can't be NULL. The check is redundant, and so is the extra variable. Signed-off-by: Felipe Contreras --- builtin/push.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index 2d6358f776..f008cd624f 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -237,8 +237,7 @@ static void setup_push_simple(struct remote *remote, struct branch *branch, int static int is_workflow_triangular(struct remote *remote) { - struct remote *fetch_remote = remote_get(NULL); - return (fetch_remote && fetch_remote != remote); + return remote_get(NULL) != remote; } static void setup_default_push_refspecs(struct remote *remote) From patchwork Fri May 28 20:10:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287483 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,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 AEEDDC4708C for ; Fri, 28 May 2021 20:10:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 948A06108E for ; Fri, 28 May 2021 20:10:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229735AbhE1UMP (ORCPT ); Fri, 28 May 2021 16:12:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229697AbhE1UMH (ORCPT ); Fri, 28 May 2021 16:12:07 -0400 Received: from mail-ot1-x331.google.com (mail-ot1-x331.google.com [IPv6:2607:f8b0:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8E4AC061760 for ; Fri, 28 May 2021 13:10:29 -0700 (PDT) Received: by mail-ot1-x331.google.com with SMTP id r26-20020a056830121ab02902a5ff1c9b81so4585919otp.11 for ; Fri, 28 May 2021 13:10:29 -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=uaw2PsITaX6kekMQc3Q0etgPrhdxsg93gJ/3LYFmizI=; b=dCTF31mWk4HdS2ccSmqdMCVsnnsGbWXQMdmTxvez/zrlTpXXyknvOt1Nt9ns6gv7YJ PhfG9rpRQ7bH7VOKJPVfKwcZcVWHRpAKkQXv7GiJTWb5E2FcHncYiEpc1WMjJMyKHpsX HpqFhbmPdOnGvoBFcAkvyhavTnmH1/qJRCCzdNjjh+6nJ9kydVASfZo+we/RLQm8Kmzi yiNMJzhweRnaeNuvzFtYcyKS4OT9MJsvq3Y24M6ow+hvIqMUb/IcOku46DhN6OQJHb+a fIFlNE4ZU9fJMmfFdaI1hgj4hbdJ9A4p/97PZL+8jhaqcOfVZebYjuQ5W3RW8IC4kGaf RnZA== 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=uaw2PsITaX6kekMQc3Q0etgPrhdxsg93gJ/3LYFmizI=; b=KS9k3yDCyojyAKqMFLMxMlDBBnkPNeRsAI7tqsu6GBXQAreQtqeqj/co/EN8SwRdZm yax4414sPQvxorlVfcA/8oGEdqWfYDFp8hTHN/yy1teMTxFsSXaa6QFpYwn5UsdpVm9+ d8HoRgSR2XGFLQ0q7SS5uTmma9Q3eOJPifM42wp5GHTEKJtvoxy+sUic5m4VPhP8Igtf PGpHunIGUbHmKJR3jcCP2AMJ9OlpCFWOiLC/tXiacrYsKvY/MNkDyBm9iOARk66TK4zd AR29jTLVcLVhXvVhHWDc5+DVccaT6ARH+9YOCgvyK+GlCyCpImoIFMDdmoUYXZz1AKz7 wpDA== X-Gm-Message-State: AOAM532Gb+0MMuK8qzqQWUD2hZqmT8KABWNLRm1t7QX6ZwGWs8kvGdjk YIhUgz7VK2lLREGh4QUaDutIsLaeQMX8kw== X-Google-Smtp-Source: ABdhPJySGCviBb4uBsLgEyde+iPRTWjfUDQg5tD/oxGpR6wz7OU9ShrZNtC9Y/1PGpBNuBYazBk60A== X-Received: by 2002:a9d:542:: with SMTP id 60mr8633277otw.143.1622232629078; Fri, 28 May 2021 13:10:29 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id r2sm1329510otq.28.2021.05.28.13.10.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 May 2021 13:10:28 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Mathias Kunter , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7AgQmphcm1hc29u?= , Ramkumar Ramachandra , Jeff King , =?utf-8?q?Ren=C3=A9_Scharfe?= , Matthieu Moy , Junio C Hamano , Felipe Contreras Subject: [PATCH 08/11] push: fix Yoda condition Date: Fri, 28 May 2021 15:10:11 -0500 Message-Id: <20210528201014.2175179-9-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210528201014.2175179-1-felipe.contreras@gmail.com> References: <20210528201014.2175179-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org We want to check if remote is the same as the branch remote, not the other way around. Signed-off-by: Felipe Contreras --- builtin/push.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/push.c b/builtin/push.c index f008cd624f..2dda1724cc 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -237,7 +237,7 @@ static void setup_push_simple(struct remote *remote, struct branch *branch, int static int is_workflow_triangular(struct remote *remote) { - return remote_get(NULL) != remote; + return remote != remote_get(NULL); } static void setup_default_push_refspecs(struct remote *remote) From patchwork Fri May 28 20:10:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287485 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,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 0955EC47087 for ; Fri, 28 May 2021 20:10:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DF8C66108E for ; Fri, 28 May 2021 20:10:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229711AbhE1UMT (ORCPT ); Fri, 28 May 2021 16:12:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229674AbhE1UMI (ORCPT ); Fri, 28 May 2021 16:12:08 -0400 Received: from mail-oi1-x236.google.com (mail-oi1-x236.google.com [IPv6:2607:f8b0:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C762C06174A for ; Fri, 28 May 2021 13:10:31 -0700 (PDT) Received: by mail-oi1-x236.google.com with SMTP id v22so5422515oic.2 for ; Fri, 28 May 2021 13:10:31 -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=x4XjHxg08SD9p40sFbkzukBSskBwvuPBvLL5utPg4jI=; b=Y1lt7R+H9KJ5O++zfZMij365gVkx+9xBZWDb9zGFEVQZwE/19xrx12jtEjhHg1TowT Ku4MBOmjnY7aawiWfYJF1Gbz8I7E7cP2kJ8qqEP2bd00xXt+UDYhvwwfADY5gGltWB3a Ti4aJV/evDaCZfpyr85magpIJVoN8S4dN1cZq0sZjT3gIE0RdYjdlAg7uAkP+Vx+3CPn 0TCYRN2IL2oo6rvxbS041+W5U78sTLX0LaCn60Q0otkTyntXSJeOzAQVDCTXdMkGuacX GNb7vdT7YI+xaXowtEB1KoVKd11XnLCny43YAiU60b4N9i46nmsy6kEl6Qj8o/TR5qGu 8EmQ== 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=x4XjHxg08SD9p40sFbkzukBSskBwvuPBvLL5utPg4jI=; b=kPXzswxdospM1ZW0VbUPrTqAn1+JnVCeM8XfAeX0ngvI9FMDrdbUXJHyYdaOOUuiDk 4/iBg9E0F8nB63DL5Xqvg6e3dvf4tsGxVz/RSGLuKRqqcDsy/4Os1xT8iiO3XcIflcJB NxhQKt9c98b3yqt3Z+IUOEWSYxR5/shmlaNMEdpGKHSVpJCeVIY0dMbS0BzpUG7psQW2 6sObMz+5meCH1uVsu/qZwOl2jEfa/khOdErmIiKfVCNLCfjtUszZV/oRNDFDKa0mVwo3 ezGRb/d9F9A8u69BTGCXQA3wyerfGgOFVPKi7edCKmNr9SE5jb2rgfhjRVEjLEKm/Wzi 0/wQ== X-Gm-Message-State: AOAM530JuQE4ZBt+YoX1b+DlQzoZo9yBkbYjw4JUnPIaWZpSpO5F3mHZ 7CPNwcId84BqkLpUjWgFFKTV+AC0v+Bctw== X-Google-Smtp-Source: ABdhPJyMiS1T6YIabkKTIAxVxYMHklkyNqfh/rDt4O5DSAnaARkMks/gL3Lk52fE28/1pdaPlKum9A== X-Received: by 2002:aca:6543:: with SMTP id j3mr7062017oiw.159.1622232630513; Fri, 28 May 2021 13:10:30 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id a8sm89221otd.16.2021.05.28.13.10.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 May 2021 13:10:30 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Mathias Kunter , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7AgQmphcm1hc29u?= , Ramkumar Ramachandra , Jeff King , =?utf-8?q?Ren=C3=A9_Scharfe?= , Matthieu Moy , Junio C Hamano , Felipe Contreras Subject: [PATCH 09/11] push: remove trivial function Date: Fri, 28 May 2021 15:10:12 -0500 Message-Id: <20210528201014.2175179-10-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210528201014.2175179-1-felipe.contreras@gmail.com> References: <20210528201014.2175179-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org It's a single line that is used in a single place, and the variable has the same name as the function. Signed-off-by: Felipe Contreras --- builtin/push.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index 2dda1724cc..8ecfbe8d63 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -235,15 +235,10 @@ static void setup_push_simple(struct remote *remote, struct branch *branch, int refspec_appendf(&rs, "%s:%s", branch->refname, branch->refname); } -static int is_workflow_triangular(struct remote *remote) -{ - return remote != remote_get(NULL); -} - static void setup_default_push_refspecs(struct remote *remote) { struct branch *branch = branch_get(NULL); - int triangular = is_workflow_triangular(remote); + int triangular = remote != remote_get(NULL); switch (push_default) { default: From patchwork Fri May 28 20:10:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287489 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 9A024C47087 for ; Fri, 28 May 2021 20:10:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B0F7613E3 for ; Fri, 28 May 2021 20:10:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229744AbhE1UM3 (ORCPT ); Fri, 28 May 2021 16:12:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229727AbhE1UML (ORCPT ); Fri, 28 May 2021 16:12:11 -0400 Received: from mail-ot1-x331.google.com (mail-ot1-x331.google.com [IPv6:2607:f8b0:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1AEFC06138A for ; Fri, 28 May 2021 13:10:32 -0700 (PDT) Received: by mail-ot1-x331.google.com with SMTP id i23-20020a9d68d70000b02902dc19ed4c15so4658362oto.0 for ; Fri, 28 May 2021 13:10:32 -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=g04W9JY/JOahuUPsiWb8TZbbZe6QH2TGw+zH4m6yw5I=; b=Dk7Q4+VKAiOIT8KkUt0cgVHmu78zTQ2mYesF6rMiujExxBCRJ76us3/b1FdjtZwA+7 3AgOsoqsCLFMvuKFFCRGdhMiGKPtqaYnvqNDyC41o3LeweQG4UDPTmcTwhh1EEjxAYM4 TpEibERi1qbM3dvOwLtGR5ivXwL0MuZAfHfKHeNDDpFEAKLz9tgZigqy4xFinhWaWrXI bnapqjnKBEK7PYPoAFPn/gXQYq88QTEnQZuPEgW/mctqwmhs2Mb6MQuIr3akw+1iErcv ml5EWFZ13INEHURjpvweOulFygkOXk3qkTDhXhrIXuj6nmRm9RM+bL+4bbXS3YDsf036 RlLw== 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=g04W9JY/JOahuUPsiWb8TZbbZe6QH2TGw+zH4m6yw5I=; b=O4Cdk1/8M2AuBz89sh+pCYhKdS+4ZJFLGMr40L0GyzUBcjbviNSIE7IBW8uiEmeuLM 1GsRjDAkRWIdMLhDGFobgY37vAyiApniXYHAtUrDy44Q+czPTW5sYovFJgC/MdIWTNfi nDB9ihED0ejjARiyixUD/u8q+RogRZemYpHErYOclwQw8UvCKTwJUTBWbjEvRjtiGsmw t74LKR9EAVSRl2v56kY2KOs+YdIFz1JS4Y062iaQ7nxERZBb0rbud+ERIMNLdVACyZmF eZiD28rzItPUSbii46DJkXPQx5uTrXT9i6t55A6aO3YUk0T3kgqaCjSX8VizcczR3Gq/ Ts3Q== X-Gm-Message-State: AOAM5303ESm1ydlzdJLI4TKvshUfhZdRWtsYIvmTtD6zaZGDf7PFLC1b qrpCjPrc4yEPCMK2bEwzJLAF3c1GLjEeLw== X-Google-Smtp-Source: ABdhPJypYvSOw7JFAKzWbNWLhNMtqCUnVN8mZR7x/VP5Wpv2Wn9lK8tFLVBwH7yrm17Y3aPol9Lw5Q== X-Received: by 2002:a9d:bd7:: with SMTP id 81mr8466767oth.133.1622232632009; Fri, 28 May 2021 13:10:32 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id a14sm1331778otl.52.2021.05.28.13.10.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 May 2021 13:10:31 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Mathias Kunter , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7AgQmphcm1hc29u?= , Ramkumar Ramachandra , Jeff King , =?utf-8?q?Ren=C3=A9_Scharfe?= , Matthieu Moy , Junio C Hamano , Felipe Contreras Subject: [PATCH 10/11] push: flip !triangular for centralized Date: Fri, 28 May 2021 15:10:13 -0500 Message-Id: <20210528201014.2175179-11-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210528201014.2175179-1-felipe.contreras@gmail.com> References: <20210528201014.2175179-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Git is a *distributed* version control system, centralized workflows are the uncommon case, where we do need to do extra checks. 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 8ecfbe8d63..1856f62861 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 centralized) { 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 (!centralized) 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."), @@ -210,12 +210,12 @@ static void setup_push_upstream(struct remote *remote, struct branch *branch, refspec_appendf(&rs, "%s:%s", branch->refname, branch->merge[0]->src); } -static void setup_push_simple(struct remote *remote, struct branch *branch, int triangular) +static void setup_push_simple(struct remote *remote, struct branch *branch, int centralized) { if (!branch) die(_(message_detached_head_die), remote->name); - if (!triangular) { + if (centralized) { 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" @@ -238,7 +238,7 @@ static void setup_push_simple(struct remote *remote, struct branch *branch, int static void setup_default_push_refspecs(struct remote *remote) { struct branch *branch = branch_get(NULL); - int triangular = remote != remote_get(NULL); + int centralized = remote == remote_get(NULL); switch (push_default) { default: @@ -248,15 +248,15 @@ static void setup_default_push_refspecs(struct remote *remote) case PUSH_DEFAULT_UNSPECIFIED: case PUSH_DEFAULT_SIMPLE: - setup_push_simple(remote, branch, triangular); + setup_push_simple(remote, branch, centralized); break; case PUSH_DEFAULT_UPSTREAM: - setup_push_upstream(remote, branch, triangular); + setup_push_upstream(remote, branch, centralized); break; case PUSH_DEFAULT_CURRENT: - setup_push_simple(remote, branch, 1); + setup_push_simple(remote, branch, 0); break; case PUSH_DEFAULT_NOTHING: From patchwork Fri May 28 20:10:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287487 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,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 6BE3BC4708C for ; Fri, 28 May 2021 20:10:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 480D06108E for ; Fri, 28 May 2021 20:10:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229719AbhE1UM2 (ORCPT ); Fri, 28 May 2021 16:12:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229607AbhE1UMK (ORCPT ); Fri, 28 May 2021 16:12:10 -0400 Received: from mail-oo1-xc35.google.com (mail-oo1-xc35.google.com [IPv6:2607:f8b0:4864:20::c35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3774C06138D for ; Fri, 28 May 2021 13:10:34 -0700 (PDT) Received: by mail-oo1-xc35.google.com with SMTP id j26-20020a4adf5a0000b029020eac899f76so1209016oou.7 for ; Fri, 28 May 2021 13:10:34 -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=6yPRIxMaEmatql/iE0aU5/peL92oJZwDi8tc8QjZkN4=; b=dt2RwpJk5Ezeai2yoL4Z+pzWUNjnQdYA8Ar7dPU72cAcG0BLVuyVaBHpOdbzFqRaNh SV/+YwtTjSe7nJKLs1iYsExoGVfFh5zN/o8O2hew4cvn4ljSianPDEBgS8YRZMFJS3OR BXJAHZro9/Jxb6KereZUEiAB+7OvBqK89V0WMhewz/yAwEoQp/fB7ensfD3qvz/asDX/ S0ii00VBhxzPgW142D9DLVj1Zph6p6kImwdtuRkH+D6nXRQyv3inNpSYnmb/NpUXkaz4 njCH5huHRZIVRT9tR0p/XCDWGO1oYN/WYmAqNnsxVaOjzxgUAYwt+eSx8z9YvD40jXgl 9OyQ== 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=6yPRIxMaEmatql/iE0aU5/peL92oJZwDi8tc8QjZkN4=; b=o9Uj1aTF5hCTbW4X6YTubhd2F4MxszsIqki1rlkVsv5J/I+uCSS3SPCHmowyabVQRx mhZCkuItAffNBdDgr6QM18C6d893t4ZGstSEa/Hxd4nWVBixQzoRTgKWKOQuXn/026Bf 1fOzh+AKgGKdyUsaFKlZ6tZ6qySDgolkFwneurZT6QoxEtSVS63HbR63L5Bycc7A6wOI S6gWVAJgjQetOgeWjiDtv+O74f4M7zAq5BwVjw+3KXy9Y6QIZJw2fq11V7eVYb70dKib OBoQ8QGCvBqLed010Bow9VLh9Rk4SYpTcNafXvTvUBVbPJTi4GYve33krW97ZfJtGeIh 6P0A== X-Gm-Message-State: AOAM530IUP0AqEVNhwLxeNJn9K6LjH6HhGAw7oDUD5TEwSwjZIJo47QP mx1oZWSAVIoCyw/IEgSlLR01txc5U3yruQ== X-Google-Smtp-Source: ABdhPJwOIAI7RLmYaIhKVmlMOciNQaZa0y0ChOvFdspR5BNqCwsgE2bDpSVTiOC302dcIxgLTaUHJA== X-Received: by 2002:a4a:1145:: with SMTP id 66mr3764035ooc.14.1622232633493; Fri, 28 May 2021 13:10:33 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id h9sm1307779otn.56.2021.05.28.13.10.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 May 2021 13:10:33 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Mathias Kunter , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7AgQmphcm1hc29u?= , Ramkumar Ramachandra , Jeff King , =?utf-8?q?Ren=C3=A9_Scharfe?= , Matthieu Moy , Junio C Hamano , Felipe Contreras Subject: [PATCH 11/11] doc: push: explain default=simple correctly Date: Fri, 28 May 2021 15:10:14 -0500 Message-Id: <20210528201014.2175179-12-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210528201014.2175179-1-felipe.contreras@gmail.com> References: <20210528201014.2175179-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 unconvolutized 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 Reviewed-by: Bagas Sanjaya --- 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