From patchwork Sat May 29 07:11: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: 12287695 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 B103BC47082 for ; Sat, 29 May 2021 07:11:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 78E2F613D1 for ; Sat, 29 May 2021 07:11:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229602AbhE2HM5 (ORCPT ); Sat, 29 May 2021 03:12:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229559AbhE2HMz (ORCPT ); Sat, 29 May 2021 03:12:55 -0400 Received: from mail-ot1-x336.google.com (mail-ot1-x336.google.com [IPv6:2607:f8b0:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3024C06174A for ; Sat, 29 May 2021 00:11:19 -0700 (PDT) Received: by mail-ot1-x336.google.com with SMTP id 66-20020a9d02c80000b02903615edf7c1aso5675778otl.13 for ; Sat, 29 May 2021 00:11:19 -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=8O61jYaktYVCtPUqpmmvoRMxB8a7kmLTJn6Va3fKmOE=; b=uZN7KJvRdm1sNYDOlXCQNPNG6u9GiwFYwAeQSUzLO8z4VZhytwRoRWZ5k24XFBOBJB kwVDHRQTU5HtA1di2mye/ExjtW3p0bZxpTE+o3xirJ3ve3bUpZk+lMaA7YwsJBhNHFl9 wOY/AugVBP4mjb6kA+R/4zDNxp7IM5HzzmBlWKfKAhyNLNYzrbfxanYSOfIwdGcnMjfy 3L6yDTLfzfOJs1Hth3lji9GAihNixkR2OI8WjgikcWVTnl/yA0dmYSlKNpyPE91Z2IxM 9dy3XaNFz6L9KR4+FHU0yjw8HebfwJF/ruVamDRspqKIAPgni+zyYTAywZTkc0washhW oERA== 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=8O61jYaktYVCtPUqpmmvoRMxB8a7kmLTJn6Va3fKmOE=; b=KEXrLU/7+ithyeUrCT1sPWY9DzNv8/WdqZQgXi5XFXxiNvcmCJxLeDwKE46Z40Vw6T P6LbxB+WlZcFSjrMe46Nu+cIJeABMC13Jn5COGLZ7wz7NauIvX1wRHoPaWU3H43NlFoA WK0nHxwlIKImH7qRipCs8kmd5DuGxOyKZz6Tk3sNOCY3ZZnmwMmbjM+iRfJLib0t9Jwg eWvwvjfLlFt/uGdYxgKpCUBuItw8V8POcvnXtx2HeIxFqpIsEM+bVFvyycSgWm6QdoTX Eaqn/IoVOI3dXDb0J4dwPkgoLxg7uT9RVBmnXM8WdusU25uVBPWYyhRzqOcJSJyPRDDo 7rxg== X-Gm-Message-State: AOAM531Fh1Q+vQOCQe/lR8eMtvqc6Wg1KwkqdsbwKKFbY+MBhiFp45QU lM+S28IsbS3jlSlzsF1O31fUFSb5wYQvtQ== X-Google-Smtp-Source: ABdhPJwL2IMZGz13mmeHuiALE3poL3iL25RpwMsfKvpaRIybfriowpUvp2c3KEfVt7XdOG0XuzdTaA== X-Received: by 2002:a05:6830:1103:: with SMTP id w3mr9965292otq.6.1622272279169; Sat, 29 May 2021 00:11:19 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id f2sm1615656otp.77.2021.05.29.00.11.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 00:11:18 -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 v2 1/6] push: hedge code of default=simple Date: Sat, 29 May 2021 02:11:10 -0500 Message-Id: <20210529071115.1908310-2-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210529071115.1908310-1-felipe.contreras@gmail.com> References: <20210529071115.1908310-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 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 Sat May 29 07:11: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: 12287701 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 C0E33C4708E for ; Sat, 29 May 2021 07:11:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A29C6613EB for ; Sat, 29 May 2021 07:11:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229698AbhE2HNK (ORCPT ); Sat, 29 May 2021 03:13:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229560AbhE2HM6 (ORCPT ); Sat, 29 May 2021 03:12:58 -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 A3426C061574 for ; Sat, 29 May 2021 00:11:21 -0700 (PDT) Received: by mail-ot1-x32f.google.com with SMTP id i23-20020a9d68d70000b02902dc19ed4c15so5763550oto.0 for ; Sat, 29 May 2021 00:11:21 -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=rREcBbsV05T6arn3ojBo1xuxHiGi0ePkc4YwsDcrJlU=; b=Q+3Na51yCPGPkxY0qWamK1bzd7Nb8k93hymlHfq2wlvevdTtREwipff4Yez4Ep+HvC DIfPhhfOTv1dMVgzqol6afs/xPygNEB0dmSys7XcIaX9jMxujifEdZHEs+Ko4dV0Zhon QpMCm/6g2DY4VYEURGP5QfIB5e2gH7d3s8CtTflhRi3VnlcX0WvTvmBbHMMddc3USEFi BY9TgsONTKCHqE0CIaVNZ5PH42nPSDU/Xr+Xtup8tScdGvHplZLDZ+/VNSCLDgEBrQK+ Jxl4bB+hcCm3MZziKlG5UL5eWVLBPnqktBo/l0Skyvu1Fr2wa9/E1Ij3ytQQ05OuZEV9 +Qww== 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=rREcBbsV05T6arn3ojBo1xuxHiGi0ePkc4YwsDcrJlU=; b=Pcube3DKDfVmQSCLzM1zsVs7OXC7kFpSVFUw4q01pLTfogdjNxm/vp9HCzvZeCHNeZ qeBaI4MzHEFdvIZPFHzm0Ian0l/0nEg6xViNdIjYxgO9LneTVSwYN6sI0AE680dCB8Yt Dx5r3VGcua+O1a0150n9NFJtaWkBGwzuVSBCbiHIybXaSNPi5E+1h0ftGfeceutDTjgP qLNiEnZJgZlnXG+I97yuMsaLWeATAKAmEu6dBEJAkBAI9vy3+9qZgi8//iCmePbN0E2N rAvuWaB2ZGQJQdsnOSzfZ9s232JUZPTYrjyQIZYKpba8VvQRmoVLESYPiiLJgqgHGiDC XY9w== X-Gm-Message-State: AOAM533jFYOz1Gd77qw4LR94++t5CmS6favP0M5cMDsnm1GLazuIyeP0 RIirbyA4/A5pGgw+4dQzCJEFuM708f1VKQ== X-Google-Smtp-Source: ABdhPJxY75YNB0W5jI7wDHVj1+3NoKTg1qIMb7dDEhUh8GxrtYP4EeQqZTGKGU4Eg0k9Y+EHRC7NSA== X-Received: by 2002:a9d:3436:: with SMTP id v51mr10177582otb.346.1622272280833; Sat, 29 May 2021 00:11:20 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id e83sm1558113oia.40.2021.05.29.00.11.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 00:11: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 v2 2/6] push: move code to setup_push_simple() Date: Sat, 29 May 2021 02:11:11 -0500 Message-Id: <20210529071115.1908310-3-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210529071115.1908310-1-felipe.contreras@gmail.com> References: <20210529071115.1908310-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. 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 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 Sat May 29 07:11: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: 12287703 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 E07B8C47091 for ; Sat, 29 May 2021 07:11:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B32C2613F4 for ; Sat, 29 May 2021 07:11:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229704AbhE2HNL (ORCPT ); Sat, 29 May 2021 03:13:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229616AbhE2HNA (ORCPT ); Sat, 29 May 2021 03:13:00 -0400 Received: from mail-ot1-x332.google.com (mail-ot1-x332.google.com [IPv6:2607:f8b0:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18D08C06174A for ; Sat, 29 May 2021 00:11:23 -0700 (PDT) Received: by mail-ot1-x332.google.com with SMTP id i23-20020a9d68d70000b02902dc19ed4c15so5763583oto.0 for ; Sat, 29 May 2021 00:11: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=00WTZNHAP0OkRIH1LtSnJF2K7Acw8lm71/cgExdXMiY=; b=RiSdQBJ/HZfSaLbHITXWMOWSmyF2Xho1buZz3iOEcOBrNBz7mFVY6CHN6YdFkPV1Ez ZRoBOH6ZoKZySvPyLo2+2ETbdru0PajoqNMuqzPvfKXEiQTInjGx18xqx/2UVGp0Fpu7 qV3Q/0yVKDS2pHH0DOlawWPaJ5ducOQraA0WYpHucw6rKb+jqmd0TtGXXiPXwbq9T08T ivg38IRokpJBgzNorkarX+dxcGNPlQQNxP+NMasE/gD58O3CvdOfELrmp5xmiuiGUkiR S6yN0/5SrQetPjwiOUkD/q9IRYYNc8a2RIQJDus4YWHa3iU5DEVZQ0poJl04sqG+M4Nn mYvw== 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=00WTZNHAP0OkRIH1LtSnJF2K7Acw8lm71/cgExdXMiY=; b=A63U+TEdsZNjeDz7vhr0STxmTt1zOFcTVzWbOGh76rb5PQFyTCZMhKgOGsOCWSbphv qqL8aIzcAcmuR63t6uSW5lXU7imEhjsGw57bOlu2NP7n59PAcA8fAyHAntfpwO349YXv PzzGRmGecZAqf2HJntSjrQ/xD83aRPtZU9M290X/f6OfbxIBkBZpNAUubiB9tsh6QcJe 8SroSdpPq4VO6iGUMBiuRiFAnK/PgfsPSoYqSdC82hrs0evHF3rVoc1PmshGKuiaVf8N M2zOFFma+JY929k8ahz+Qvj+l30SKBvmN0dhc41R3szbY8FTrpICERgqL8Hrz00SdpWI rlzA== X-Gm-Message-State: AOAM531bxJBqIhx/+JOmRT0gEvxGRR5R7BCFYCu7qk7+R2Sppvq1bqpd MPp1HL+sYuEzOcL8ZwYwshVWOJPOznaw1Q== X-Google-Smtp-Source: ABdhPJxNUBHxfF7k54VG6Xasv+aTzgbul2EPxs+tzBJBHDZULvsQopl/91aX/ZjXVZKISyd42iDxBA== X-Received: by 2002:a9d:404c:: with SMTP id o12mr9828100oti.113.1622272282265; Sat, 29 May 2021 00:11:22 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id i23sm1562806oik.22.2021.05.29.00.11.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 00:11:21 -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 v2 3/6] push: reorganize setup_push_simple() Date: Sat, 29 May 2021 02:11:12 -0500 Message-Id: <20210529071115.1908310-4-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210529071115.1908310-1-felipe.contreras@gmail.com> References: <20210529071115.1908310-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 'trivial' conditional is a no-op since that part of the code is the !trivial 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 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 Sat May 29 07:11: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: 12287699 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 EEEA5C47092 for ; Sat, 29 May 2021 07:11:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C4223613D1 for ; Sat, 29 May 2021 07:11:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229708AbhE2HNM (ORCPT ); Sat, 29 May 2021 03:13:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229620AbhE2HNA (ORCPT ); Sat, 29 May 2021 03:13:00 -0400 Received: from mail-oi1-x22e.google.com (mail-oi1-x22e.google.com [IPv6:2607:f8b0:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8663FC061760 for ; Sat, 29 May 2021 00:11:24 -0700 (PDT) Received: by mail-oi1-x22e.google.com with SMTP id w127so6610419oig.12 for ; Sat, 29 May 2021 00:11:24 -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=3hCVT5xI6KfZrQua/CgZL6pamP/sC/G72IthpphwsZk=; b=aJ1HhYk0oZM3aXI1maZu8vUOQNeujHKCfFtOFyLYOtX96pC1xjWDfuOJIKgZhQww/+ aoFf7ew51Kiq3gmCeSYdqC1x0o0NjOSXjasciEhSmG30BvkpgyxvR5H1bR6BWHVyyiqz DEaTBOD5Rng9GFAv0wbWMo/TWIDfIHlWQkwcOB+3iLoiPnGZaIBcf13AzHKQO5tLGmJn 2Ywe3MWy/J0tq8EtgjuSu7XuBH8KBrJ60atgiRwc2HNCc/C89Tm1MjjsjPlA9EZrq3mr lZ2l8RPtOkXwGMxFd+H7UhlLwSsS5m7S+G8pAzlwyyOXdHHSgdoGTMt3hYhWSa5EVKr1 lZFg== 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=3hCVT5xI6KfZrQua/CgZL6pamP/sC/G72IthpphwsZk=; b=lxIQyxV3Bra4pXobBpD3EZ2Np37izp0y4+UhRcm8wcqIgRWxsZPwwMUNB5ErEHQOMr sghrqHl22XRO5G0EPcpB7mUiiDmxX88w2462uXDLM/2d7MIXfE9R/5tVzygmVCt5aobU 9/aksFjVMsP1UGBXVDoHtERFwx0WzkKV99IjLP0/R7maa3Ow/9B9GKz8Y634BqXDNS/a HuzUUezSmtiBeTcggRoI5PcJmDvZHpUELbTYGAcB2ZJo0zCHGgKLapTM5mZCirTFygMd uqv/l5+PYHUhtYwr3XMglyf4pDvcCRn3mQmklWrPkd+u0PFT0JuUrnwuuTqAOq7K8+QC w5iw== X-Gm-Message-State: AOAM530cKhX8edsiVreg77vV2EOyj2O5j7o1BJKSw7/i0K+CSPmSDPjZ PqBpBJVz7NTJBDDdSYurVtHlEw0eOuzzfg== X-Google-Smtp-Source: ABdhPJwJAPW8uOKIe6nQyNkJOymbjjoImGTpOzQVMkzqLrIyrs4v2szD3khSMkQ93EV4OTe2b0GTMw== X-Received: by 2002:a05:6808:14c:: with SMTP id h12mr8558795oie.164.1622272283705; Sat, 29 May 2021 00:11:23 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id i11sm1706716otk.70.2021.05.29.00.11.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 00:11:23 -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 v2 4/6] push: simplify setup_push_simple() Date: Sat, 29 May 2021 02:11:13 -0500 Message-Id: <20210529071115.1908310-5-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210529071115.1908310-1-felipe.contreras@gmail.com> References: <20210529071115.1908310-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 is not 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 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 Sat May 29 07:11: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: 12287707 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 6319CC47093 for ; Sat, 29 May 2021 07:11:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3D0D86124B for ; Sat, 29 May 2021 07:11:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229681AbhE2HNN (ORCPT ); Sat, 29 May 2021 03:13:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229640AbhE2HNF (ORCPT ); Sat, 29 May 2021 03:13:05 -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 F3CA0C061761 for ; Sat, 29 May 2021 00:11:25 -0700 (PDT) Received: by mail-oi1-x236.google.com with SMTP id y76so6622833oia.6 for ; Sat, 29 May 2021 00:11: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=OemvcyPlBML11Kb0FkV4r6a65kdwZEM9NCI5+mlCC6GdWoWoJX48t/8DW1aFCqI69D fXKs12axUDPdzYOMOEm45sdUzfwnYCCpPbjC6jkos/Zng3KluZjvCOMTvG1Nk0LD7mP1 iS4UYCK75/FvySAo82pFNb1XwCL36arfzib8//nMGCefLwQyS/3dPSUdNVfexyt5mCUV 6P+VvDgB9Pf1SLfbQ3dH+kJAT3wSk1GLf72PCSWlRAWhIffU2VNRWoaV6GUICZIgyHj4 PO3U3kZflzPXC6IWulT589ASEcYUoLbDRmkaek8q++ji3sEm6Jr4wcY/icGaOASiy1Rr nfmg== 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=HdLKtQ8I0Rg1Qt8xAXcgykC4lS13BuXqCaMBU4L170pA1vqdqbRc5Ruy5lOemkp9fE vqFf1X0JfWJgZyv/iGpmcwm39OmzYHUfvLTpUEx7jbiPtNQYDrUPAxPCYemIrGqIuUo2 F2tACk11qd+i4DAZPNrXeLLHkJJ8BuM1jeQabtNqm8UyanFfYAVufj6Ef3Hf5veVR8r9 SIGh3HXo25Si1bSfvKxAEGXqd4JjBx2Gmz1CpyGqjNFHitxzASnTZUg2Kj61uZrjek2d XsCZsJN0IuHwvr9ool7kYW4DA1inNbQPn5Atd8d038JkaqSC/BqtOOxQLuLzvTFLaJQi MFwQ== X-Gm-Message-State: AOAM531E1rog4LkFOISQBl5U5k90oIsvU9xx/MKWCWJna5OT40lZUIIZ V5ltl+KvsjshzRSRNSXtcENh2ghhDtSh/Q== X-Google-Smtp-Source: ABdhPJyjOyZ/P4buStLuFLB9BpSr0F7i9/9Ie2oz0W48SQQpeo8i4VJmylhZUTbbXaCzsW+Fo1BzXw== X-Received: by 2002:aca:c6cc:: with SMTP id w195mr8336147oif.83.1622272285127; Sat, 29 May 2021 00:11:25 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id o18sm1620280otp.61.2021.05.29.00.11.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 00:11: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 v2 5/6] push: remove unused code in setup_push_upstream() Date: Sat, 29 May 2021 02:11:14 -0500 Message-Id: <20210529071115.1908310-6-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210529071115.1908310-1-felipe.contreras@gmail.com> References: <20210529071115.1908310-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 Sat May 29 07:11:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287705 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 700CCC47090 for ; Sat, 29 May 2021 07:11:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4E7E4601FE for ; Sat, 29 May 2021 07:11:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229690AbhE2HNO (ORCPT ); Sat, 29 May 2021 03:13:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229679AbhE2HNG (ORCPT ); Sat, 29 May 2021 03:13:06 -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 76A33C061763 for ; Sat, 29 May 2021 00:11:27 -0700 (PDT) Received: by mail-ot1-x329.google.com with SMTP id h24-20020a9d64180000b029036edcf8f9a6so5740489otl.3 for ; Sat, 29 May 2021 00:11:27 -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=YNHupwE7Cp1QZ3+KqmxRGYcpp2tnH7/G5k496uVRm0J9U9APrKVlcri/byDZ3b2GZp qBncOIsKMbLCzgBuRb45C+8sxoPO3H3Fon/YeUjl8eEhdqwuuoSYFxu/MKzLBmO8EuQR xB3FoeZij+Q0kpuDeotyJBAX9Zl4XSoqBMYVCxTLoh2Q0vAlSDsaQpGxXPm4rl37g97v gAg3MqfkxKCrkDCA7t1mBm/TcLDy2QhoyFJJlT0DwJ+xg3SsWKFl8EI79xHaNxf06oDd vwYpszRhEDE4+Z9+E33t7FDo2JAnIOHv3AOj2nFr8IMsQfQ/xntFuUnMy9D8OthElGxU 3WxA== 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=Fc4983yyz80EP+DoEeUpjnm6vRSKb1HgUSrKlRniVIU3Vm9tadeasOJSTc9Gm/3m0Y bzNv/Qk73Hpg4iC1/NVbmieekRIrgZqJ/2grHaI8TrZRiSlbceTos9cIxWXGv6SEeZMl 830iQRmsqM2hWVYeI4sdnmWGwO6Cs/rFcd8moZJ3YnIahgNGfgPIMG2oLmsekXJ75FEZ 3b+9aFWFxUC4+vQ8GevWSGBtmeWcl9bSUhJL6floruVb1BKp/1Ua3PqJ5IfJGO+fNGHI ugykQnfG/1cb1l9i38zQMUuyguWzjwj4uoolZOv3nNEKKY7rGITtB5b4mINNCZenieH6 256Q== X-Gm-Message-State: AOAM532tmfuilAIKLqkCAb1M7QKTD+7V5leLLUg6D8H7C3nFBnac+XXf cIViBebPTLGzRxEvkZJ6Wh+Qb1c5pS8uMA== X-Google-Smtp-Source: ABdhPJz5Ym80iZ4jFIihmsBhdG07tcF53N4HRmLFT3lu6vmuLXD/G3Lzjz92w6HyAm3IsAMPeSq3VQ== X-Received: by 2002:a05:6830:164c:: with SMTP id h12mr9990514otr.321.1622272286544; Sat, 29 May 2021 00:11:26 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id e26sm1544445oig.9.2021.05.29.00.11.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 00:11:26 -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 v2 6/6] doc: push: explain default=simple correctly Date: Sat, 29 May 2021 02:11:15 -0500 Message-Id: <20210529071115.1908310-7-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210529071115.1908310-1-felipe.contreras@gmail.com> References: <20210529071115.1908310-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 From patchwork Sat May 29 07:44:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287741 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 A94E8C4708F for ; Sat, 29 May 2021 07:45:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8AB7561222 for ; Sat, 29 May 2021 07:45:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229636AbhE2HrB (ORCPT ); Sat, 29 May 2021 03:47:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229602AbhE2Hqr (ORCPT ); Sat, 29 May 2021 03:46:47 -0400 Received: from mail-ot1-x336.google.com (mail-ot1-x336.google.com [IPv6:2607:f8b0:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A817C061763 for ; Sat, 29 May 2021 00:45:11 -0700 (PDT) Received: by mail-ot1-x336.google.com with SMTP id t10-20020a05683022eab0290304ed8bc759so5725628otc.12 for ; Sat, 29 May 2021 00:45:11 -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=B3M9DVF3Kevb0rRWbnLO6lULos2KqkQTnkRkT+6t8to=; b=jTdvjOs0c2mDrlbNTbqy4jCzHXS0cUpgNq+l8/sgvjpdn7e9WRl+gDmey5fBefXZXQ 8g0W3A9Td7TfwLnukZN+uR0cNmb+7SZVdZJGyZT0JEGIvBvSBnYX0OtT3g6Yhfd/51eF ishv6JuxyPSFTdBQQWcrsPBEF0UaYO3WLlCE9mSe5ZqzlFGnReXGHIKFdkBWNnBTWTtT x4S8bsLbutRoGSHX/pT3u1Xh2lyVXXb4O7dBRgjzXW+JzZgh79YcYgvbtqUeYZFaNag3 uEKod4BWsBQNoL6Or0sAOhTUZqJrd2StlDCw5XU3REzTT0TRxVX6PjWXix/0IAE1cjsy fDcA== 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=B3M9DVF3Kevb0rRWbnLO6lULos2KqkQTnkRkT+6t8to=; b=HfzKXra0MqpfJyNSOZxXURsBHM1qPoRz5BdJC0jNAbNJj4bF0IMJMOjWIQf/PV50A7 hS3eEPujIsFJrFRR/YyPY/5aG733U/6NvwicTpdUuOaqSnWXW7kFqTnPxxm8zUZ6Exqt YgsP5vVaWclHk7I4mPoXH0D9my8tZHkqrlFlZhmpMjRAS/x7bGyIi1GQqpm6idHJI9A0 S/tLUfEMyuWRluUfVInpp5dvEzczOYlN9pbt//+aB2NCqghD60wwofmHPh9c4cQc/6gR d8j7PSmemsmstieOFVoApcL5QOx2DJ5JuLhiSP1u5JCFiAocAVzgIgY/DVjo29QVZDZ5 Wf+A== X-Gm-Message-State: AOAM530AgqULCG11A7BH4DQ1qH1xeslUnZCbU4q79GvrPt+yUuJc3+pR HOVL6RVT0mPgiCiquE6n0wZ8bdRXQ+2iXg== X-Google-Smtp-Source: ABdhPJymWflDVCK53TfwSaah+Plhj/jgjgLTp1349IiWJO2JMZlQgJxHbIb/Cyh324a1dWtThcbkNA== X-Received: by 2002:a05:6830:1d81:: with SMTP id y1mr10101178oti.24.1622274310300; Sat, 29 May 2021 00:45:10 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id i11sm1719014otk.70.2021.05.29.00.45.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 00:45:09 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Brandon Williams , =?utf-8?q?Ren=C3=A9_Scharfe?= , Felipe Contreras Subject: [PATCH 07/15] push: trivial simplifications Date: Sat, 29 May 2021 02:44:50 -0500 Message-Id: <20210529074458.1916817-8-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210529071115.1908310-1-felipe.contreras@gmail.com> References: <20210529071115.1908310-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Felipe Contreras --- builtin/push.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index 23b1908a5c..21968abf6e 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -205,14 +205,12 @@ static const char *get_upstream_ref(struct branch *branch, const char *remote_na static const char *setup_push_upstream(struct remote *remote, struct branch *branch, int triangular) { - const char *upstream_ref; - upstream_ref = get_upstream_ref(branch, remote->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); - return upstream_ref; + return get_upstream_ref(branch, remote->name); } static const char *setup_push_current(struct remote *remote, struct branch *branch) @@ -222,15 +220,9 @@ static const char *setup_push_current(struct remote *remote, struct branch *bran static const char *setup_push_simple(struct remote *remote, struct branch *branch, int triangular) { - if (!triangular) { - const char *upstream_ref; - - upstream_ref = get_upstream_ref(branch, remote->name); - - /* Additional safety */ - if (strcmp(branch->refname, upstream_ref)) + if (!triangular) + if (strcmp(branch->refname, get_upstream_ref(branch, remote->name))) die_push_simple(branch, remote); - } return branch->refname; } From patchwork Sat May 29 07:44:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287739 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 EAA16C47082 for ; Sat, 29 May 2021 07:45:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CB898613CD for ; Sat, 29 May 2021 07:45:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229716AbhE2HrA (ORCPT ); Sat, 29 May 2021 03:47:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229698AbhE2Hqt (ORCPT ); Sat, 29 May 2021 03:46:49 -0400 Received: from mail-ot1-x32d.google.com (mail-ot1-x32d.google.com [IPv6:2607:f8b0:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A879C0613CE for ; Sat, 29 May 2021 00:45:12 -0700 (PDT) Received: by mail-ot1-x32d.google.com with SMTP id i14-20020a9d624e0000b029033683c71999so5779925otk.5 for ; Sat, 29 May 2021 00:45:12 -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=uaDUUJtBHOSKUGXjCQ9xiQOF0tQz+VG/Rz1liXUEdgo=; b=AW1yfeePsXEvucoFP/QgoeGUbAfQhp/p2D6lAa12Jn9I41iHPjGixqa/mNMFW70GDO jFRALJYAli1B1Xmn9SDezEXx94Y8q5hlOv/CLJSxM3fHTgSWiliwoAPNFXOdlLJMWQPp oIgqMuIravtcLp/buCpHWaQGV9Y3xH2O4Cad8y3OuJ/n3sPAs2OQOrl7atEM16fLfiRB KK6XdZxGxl84WmFtKn0pOIGBF6cyWBNy7gAfsyx0MMKt8sHX1gmXKvebyrGWRqsS8nIx 9oatQskRQhbC+pNG8HbSqpc65tP00jFi9euVb0eRxsXJdmxRxRX0y42eH6OmXc5Y2tcn ZTMQ== 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=uaDUUJtBHOSKUGXjCQ9xiQOF0tQz+VG/Rz1liXUEdgo=; b=k/qUny5M8Aa0gwAdD8/EDMZ+ECblXkd7xs8Kks+YXbcUmFwiVWH55PotBunRvwTbou WO9qurmwodJCI349iKm2wgv1DUFbqDP9YEMaUdKF2rV5wvoSP/ONxKoBRl+CISdjbORb LzYUGriUEsnGoacJP0+isUF4DVQ1yIc+RNOldpogUK6YbTMLaxnTR2cbXWn8AX3/xEki fNHUuTFG+zlR97coRkTdz+kN37UBwy6OcSwHjgN7uX6ZVlOnnnGv8o3DDaQBXj2NUNTf uEmr1kwrEn1U8/50THWpFET98+mOIzOfDYE6nbsoFPV4nOBaF98Fa60nXTjswnM49k+g leww== X-Gm-Message-State: AOAM532P8llV6EfMOlweiLA0Hmsm7Kp+3boXOa0DQKRV2qOGpOHOa53V K0cYcQjgZBGmshsLODDtPuDAKU50gmwlcA== X-Google-Smtp-Source: ABdhPJygEK0iQcM9v7FzU5JjlfdKMtVJr7GXIURarJXjTNRMTecOcwzXNS4mzrcb/R5rL2nvffp5Nw== X-Received: by 2002:a05:6830:1103:: with SMTP id w3mr10026161otq.6.1622274311804; Sat, 29 May 2021 00:45:11 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id f2sm1627868otp.77.2021.05.29.00.45.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 00:45:11 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Brandon Williams , =?utf-8?q?Ren=C3=A9_Scharfe?= , Felipe Contreras Subject: [PATCH 08/15] push: get rid of all the setup_push_* functions Date: Sat, 29 May 2021 02:44:51 -0500 Message-Id: <20210529074458.1916817-9-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210529071115.1908310-1-felipe.contreras@gmail.com> References: <20210529071115.1908310-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Their code is much simpler now and can move into the parent function. Signed-off-by: Felipe Contreras --- builtin/push.c | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index 21968abf6e..dbb4f78e61 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -202,30 +202,6 @@ static const char *get_upstream_ref(struct branch *branch, const char *remote_na return branch->merge[0]->src; } -static const char *setup_push_upstream(struct remote *remote, struct branch *branch, - int triangular) -{ - 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); - return get_upstream_ref(branch, remote->name); -} - -static const char *setup_push_current(struct remote *remote, struct branch *branch) -{ - return branch->refname; -} - -static const char *setup_push_simple(struct remote *remote, struct branch *branch, int triangular) -{ - if (!triangular) - if (strcmp(branch->refname, get_upstream_ref(branch, remote->name))) - die_push_simple(branch, remote); - return branch->refname; -} - static int is_workflow_triangular(struct remote *remote) { struct remote *fetch_remote = remote_get(NULL); @@ -258,15 +234,23 @@ static void setup_default_push_refspecs(struct remote *remote) default: case PUSH_DEFAULT_UNSPECIFIED: case PUSH_DEFAULT_SIMPLE: - dst = setup_push_simple(remote, branch, triangular); + if (!triangular) + if (strcmp(branch->refname, get_upstream_ref(branch, remote->name))) + die_push_simple(branch, remote); + dst = branch->refname; break; case PUSH_DEFAULT_UPSTREAM: - dst = setup_push_upstream(remote, branch, triangular); + 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); + dst = get_upstream_ref(branch, remote->name); break; case PUSH_DEFAULT_CURRENT: - dst = setup_push_current(remote, branch); + dst = branch->refname; break; } From patchwork Sat May 29 07:44:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287743 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 6CBD9C4708E for ; Sat, 29 May 2021 07:45:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4A4CD613CD for ; Sat, 29 May 2021 07:45:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229726AbhE2HrC (ORCPT ); Sat, 29 May 2021 03:47:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229744AbhE2Hq5 (ORCPT ); Sat, 29 May 2021 03:46:57 -0400 Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A9B8C06174A for ; Sat, 29 May 2021 00:45:14 -0700 (PDT) Received: by mail-oi1-x234.google.com with SMTP id d21so6658073oic.11 for ; Sat, 29 May 2021 00:45:14 -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=Suz1pXYdD/5qLCELGGMHE8KS8khHRQaYRqQueRO1Y4M=; b=dek8HBvrpTJZxHVf9wX/2SxvSK5iE4N5ahnjYdnUnZFmBhSh8LdWhvOnPW0nsVKRo9 PnCZQYTu69n9S2rE599I+XuNz8GzMgEqGKMgFXoSxv3eGkaX8ZffC7YFcnuTEkY42Q9X hEUQ2XJlF5yhdWdq5EwuWR4o0RUuu1q/hKVs/z/3fe+do5DC7uvbg0UNZoFiN2DXzHfC KIdx74rBL784j5exhBRi++ZwfAO2bRatv2U39EllQH4MLKJW/4D+n/pei0fn0z8uXXag BlwHliOx3ezlzyV2aqnl2Rlep77+qIK8JE7iSlsLcMlJtG0NEFXd4pt9OSHSgnOjKvZ3 eaHg== 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=Suz1pXYdD/5qLCELGGMHE8KS8khHRQaYRqQueRO1Y4M=; b=CVkx02X7RDGLUCPJ5ZRLlyTvhsTlmI06VsEJj6w9s5GOqmO5vU8xjmnSFLDB0N4VFl 0Ie+sVlE6GGByyeFnK34JdG1ENnF6bnRxM5FA9DcP1vnrIUGmzRPWXJwZARIrZh2KYjG phWJIRxzY58Py6vqAJPPZHbbCSelIj8KfT7+HMQBrakgz0poRVbuzUjKcmnjpxI+rLxm gWpOWFbZWlIPJOoq0nX0bSrAQDKhiAOu4SsC44TI4SBCrFEtL7r6MyUrkvEcbPaCoifO D20ysjE3QLagHq/J7G/Xz2DN7gVcHJtiyMpmTqkc/41/lL7hh8KFo4CPFSgo7As9z9uZ ROFg== X-Gm-Message-State: AOAM531gJypMP4k7nagfaMV9diGDZft/VMn+cEAg24nJT7BWr7NCbl1d 4iyqvy4tT0YFte8EHYLBm+0zq+sIrlCmqg== X-Google-Smtp-Source: ABdhPJzMQ0wmz17/Gk0q4rSTot4iefOAPuaE6YV8LkCDd0RcI05UPr1+bA3tN/Zd+NnNDEp5lTTs2w== X-Received: by 2002:a05:6808:f90:: with SMTP id o16mr8118033oiw.163.1622274313391; Sat, 29 May 2021 00:45:13 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id d65sm1649512otb.78.2021.05.29.00.45.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 00:45:13 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Brandon Williams , =?utf-8?q?Ren=C3=A9_Scharfe?= , Felipe Contreras Subject: [PATCH 09/15] push: factor out the typical case Date: Sat, 29 May 2021 02:44:52 -0500 Message-Id: <20210529074458.1916817-10-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210529071115.1908310-1-felipe.contreras@gmail.com> References: <20210529071115.1908310-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Only override dst on the odd case. This allows a preemptive break on the `simple` case. Signed-off-by: Felipe Contreras --- builtin/push.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index dbb4f78e61..94cb2eda63 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -230,14 +230,16 @@ static void setup_default_push_refspecs(struct remote *remote) if (!branch) die(_(message_detached_head_die), remote->name); + dst = branch->refname; + switch (push_default) { default: case PUSH_DEFAULT_UNSPECIFIED: case PUSH_DEFAULT_SIMPLE: - if (!triangular) - if (strcmp(branch->refname, get_upstream_ref(branch, remote->name))) - die_push_simple(branch, remote); - dst = branch->refname; + if (triangular) + break; + if (strcmp(branch->refname, get_upstream_ref(branch, remote->name))) + die_push_simple(branch, remote); break; case PUSH_DEFAULT_UPSTREAM: @@ -250,7 +252,6 @@ static void setup_default_push_refspecs(struct remote *remote) break; case PUSH_DEFAULT_CURRENT: - dst = branch->refname; break; } From patchwork Sat May 29 07:44:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287737 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 D8380C4708E for ; Sat, 29 May 2021 07:45:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B995A613CD for ; Sat, 29 May 2021 07:45:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229789AbhE2Hq7 (ORCPT ); Sat, 29 May 2021 03:46:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229754AbhE2Hq5 (ORCPT ); Sat, 29 May 2021 03:46:57 -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 9B2C8C06138E for ; Sat, 29 May 2021 00:45:15 -0700 (PDT) Received: by mail-ot1-x330.google.com with SMTP id v19-20020a0568301413b0290304f00e3d88so5774222otp.4 for ; Sat, 29 May 2021 00:45:15 -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=SrgfCQcKuArFAPYsV2apRajzLxZqKbGX8Jrt07fmBwI=; b=UBZVLxRcMszu3hGSz9UY3qjT6HalzuVzouRqV0+uCCgDo4RqJSE/hrklGjm7J9u02a WxtJ5IN3I5bBreB9K+53LNKKEgsc9ZanU0btVZcxAM6fG5P4c8KRYTp+gqvOUQ7zveCd 1psf/UQuuRUZNf7ANZSkHPdD6MOwYprDgcKySsnaUtLnjQ1m+zRgu0IxkPvvrEwfWmzA k5AB8Hh7LQ6HShpwtzvk0KNvbWcGF4aZq2lX5JuMxeJj2fYAuEGjgSygdITdmob3q7si K45MldCi4tPq7VaeUaCr5Pbgo9xE9ImShy3+Y4Ft0JX9B4IsrqeYwUdNohd4UpnHizBz DU6g== 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=SrgfCQcKuArFAPYsV2apRajzLxZqKbGX8Jrt07fmBwI=; b=aOxGehe4wQFhx23Z+36AV+wu3KZ+e5a/RD2poA6KVwlfZQLo4njS31hoO6JKNivS5D RaX7aKd6JkuNSmqyE7KeoFCAMGg7OvQERvsqLSPeDhfCbJpFEbpvHle5AuFlPljuQ0B6 0R5x8MfCX7o4GdgGiSqqpCaDvmQYK53QSn4z9ZiDpuZCG4V1lFSsLD2Q+MmZ9qYmW1Em hrtvvCCgNlE6p+jvfYTzoioKT5/z+f74JX7ZtUifuwfxqshBqTH/29G5Py0ZThur16hG /GaIw7NPnVdl32xx56Ht/9u9dO5cQZZoSihOaE93rXD1TLqBb8PmT30VQqu4RlmRoCpU f6AQ== X-Gm-Message-State: AOAM533pcWxyy4xAoPZec7+Tp98jmLMTiffDHgEh+CbeLy1F5o7UFOxj scUlaept9DXi1QRQGQ/WU5FcX1OGq490Lg== X-Google-Smtp-Source: ABdhPJwdWvOXscbZjhTQuSnPcjl/JlwIn33RkyyhIOamCiQLFBbu3d+xDuq00HmXn1q0z1aA/NxHFw== X-Received: by 2002:a9d:4911:: with SMTP id e17mr10128366otf.38.1622274314823; Sat, 29 May 2021 00:45:14 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id o18sm1632452otp.61.2021.05.29.00.45.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 00:45:14 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Brandon Williams , =?utf-8?q?Ren=C3=A9_Scharfe?= , Felipe Contreras Subject: [PATCH 10/15] push: remove redundant check Date: Sat, 29 May 2021 02:44:53 -0500 Message-Id: <20210529074458.1916817-11-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210529071115.1908310-1-felipe.contreras@gmail.com> References: <20210529071115.1908310-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 94cb2eda63..7485522807 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -204,8 +204,7 @@ static const char *get_upstream_ref(struct branch *branch, const char *remote_na 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 Sat May 29 07:44:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287745 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 7D5ACC47090 for ; Sat, 29 May 2021 07:45:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 637D361222 for ; Sat, 29 May 2021 07:45:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229796AbhE2HrD (ORCPT ); Sat, 29 May 2021 03:47:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229756AbhE2Hq6 (ORCPT ); Sat, 29 May 2021 03:46:58 -0400 Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 193A3C061760 for ; Sat, 29 May 2021 00:45:17 -0700 (PDT) Received: by mail-oi1-x22d.google.com with SMTP id j75so6666610oih.10 for ; Sat, 29 May 2021 00:45:17 -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=aNGxtTHrXhk1qF+aVsp+4wORJp4iaEyikU5jiM0MEkI=; b=og9UUzVmHbX5nT4aVTmhdgk6jzeU/o03yNm9rhYSQrh6DFKlIO0l1z1BNwzxTudTZ6 pE7KT3wgMtpL9ocv2qMKZ/fwZrrjiEPPsqfTeR4d9iD2IecK0GoY8SkU5mfELXqYx6XN n0a3nUWSvz+zv82pqn8yxduqGUBxIsQc/RA4dnqytnHxykgAK+udqn1BD/TIDDRbR0PB PXSA4jMb5JHOkppt2ip+iOIGBK1CINxVFBwdFbZGrtIsx8Cq0MAWy3RzjKoQuK+paFKg u3/Q1RC29QHTipnMm5oeAhHm+5PGeWJgjR8jI0WvUgY3h1Vw5VBg2Q5rRkdFEgc3o1dJ yy3w== 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=aNGxtTHrXhk1qF+aVsp+4wORJp4iaEyikU5jiM0MEkI=; b=N5rkjHP6XVucEvhogMbB/H+v6Gk+zfhvWBVcSkUEuCYAIorJRxoenRh2ST++FHNiej pvAUvHQ1AzaFg+2gIKzftyFmp8Ubd1rnjk0nYSuclB3M849YTp81sIlp+ncKn/TeqK2k C/ysGJN30udrSgYPZX64Yl8Tzt2JS+3VdKkHfC1iGazzgKNsJHCbo2fINHt0AvMpTRWY GWrwsP1oFJFiis8dY33kMYGkPB2JGnQMh1JmqHxVOhXxowMbjIN/2CkNEhIWL4SH6uSD oK4vi02tpew+GDTwNdU+Ld4Sour8N5l+GgjKrufYM9GaCsa8BDXvhlKevcu0Qe1Aasz1 GVYA== X-Gm-Message-State: AOAM531m2QQnUah0Mh6qxpvDhJEor08zHbGU6Gg/dzCm86GyYUK6/64x zg19HCROyjpHG2QpJrYAXhtrWF3pyNx0qA== X-Google-Smtp-Source: ABdhPJweEo0N7Ap8m3fG2RDivu8SX0vvSjqPDtp/LR+ECoY+h5LlKOvRtan0/LLT4dOTJidvpi4PGQ== X-Received: by 2002:a05:6808:1414:: with SMTP id w20mr11274702oiv.136.1622274316281; Sat, 29 May 2021 00:45:16 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id d67sm1559426oia.56.2021.05.29.00.45.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 00:45:15 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Brandon Williams , =?utf-8?q?Ren=C3=A9_Scharfe?= , Felipe Contreras Subject: [PATCH 11/15] push: fix Yoda condition Date: Sat, 29 May 2021 02:44:54 -0500 Message-Id: <20210529074458.1916817-12-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210529071115.1908310-1-felipe.contreras@gmail.com> References: <20210529071115.1908310-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 7485522807..468ccc1067 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -204,7 +204,7 @@ static const char *get_upstream_ref(struct branch *branch, const char *remote_na 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 Sat May 29 07:44:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287751 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 E8475C4708F for ; Sat, 29 May 2021 07:45:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CD61F613EB for ; Sat, 29 May 2021 07:45:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229820AbhE2HrH (ORCPT ); Sat, 29 May 2021 03:47:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229739AbhE2Hq6 (ORCPT ); Sat, 29 May 2021 03:46:58 -0400 Received: from mail-oi1-x22b.google.com (mail-oi1-x22b.google.com [IPv6:2607:f8b0:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB604C061761 for ; Sat, 29 May 2021 00:45:18 -0700 (PDT) Received: by mail-oi1-x22b.google.com with SMTP id c3so6678041oic.8 for ; Sat, 29 May 2021 00:45: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=e5UyDEfEXKS6rS5B3ctgkhPMZlfEi3/toztq9EPJRPE=; b=Bvp/iv79qCU62xlGDJj4N5K+ufWYufxKsVfOlEUJE6Lw3XgeCrhAB6PNlEEcHMyQg1 PsRn/o9gH8jyvbPrQX6cAWQ77CFUNmTev5h6NPBAMrwoRhpS1oN+ERrE3YZ0z1KKrM86 1Jaf79Hh+h2nLqtK1lDn4QRtf8OZKdf++x8eC0IkpqFh4dYIMrV7F8mGizyAjttZ6QYg ZvDgy3mD1kfkUd+xmbdoPc3lVSoEZunfh4Td5Wu3OeXQJ2nsbx3Zz75/fnnBC47ixNJN 8VuVvtkyOsarYmnbbb26bX7WDevPWQvwrta0q8JRgng9kh+RD5yUHNRzmzQRfwKOuuM4 s26w== 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=e5UyDEfEXKS6rS5B3ctgkhPMZlfEi3/toztq9EPJRPE=; b=tRluXUrd0sUaPYuG6PvNyqHLSpe7GiQbA7lCZfjFPqBaKjGIy5G/rgiKbCou48/JtO +FFYsLiAWI7F7hCxkbRHgX0/SsLTmdZm08JDmPg0bYGcn05yvBdT9Tdjeppq+MijUl3y zETmtAqkCD1OuKNo/A8CpRNDhDPgCDsX4XsLESfr/eOxBpRPV9qQErMeObKli+JbCIe/ 93xbPC0hK1U0eiF0atF2CI6u49zoN0gMmJH2T+GLdMF+d+/3bXjZZb/piB91c1aAFSLc E9D4zho+XDCxwocEYvxu/Y8cpu2pzBUJVut8VBd0+QYNdVuO6rCNUFgEWW8KQ+JwOUak vvqw== X-Gm-Message-State: AOAM531aZnwugGesfLlLWuMVH3bvm6nLw7GxbhTY1LRcfUvuhMKlJoAm if9hC8IP265Z2Wln3/o9bNgIlAVw4ZdT/Q== X-Google-Smtp-Source: ABdhPJz5TyQSQwIY+fm8BDkKMfic1xhVxHb5EBjBoXMhOE0eeqQ78D5MvlAMoPHgMSHoUP6xnqz/JQ== X-Received: by 2002:a05:6808:d:: with SMTP id u13mr8343088oic.103.1622274317962; Sat, 29 May 2021 00:45:17 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id i26sm1636539oos.21.2021.05.29.00.45.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 00:45:17 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Brandon Williams , =?utf-8?q?Ren=C3=A9_Scharfe?= , Felipe Contreras Subject: [PATCH 12/15] push: remove trivial function Date: Sat, 29 May 2021 02:44:55 -0500 Message-Id: <20210529074458.1916817-13-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210529071115.1908310-1-felipe.contreras@gmail.com> References: <20210529071115.1908310-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 468ccc1067..c220f70795 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -202,15 +202,10 @@ static const char *get_upstream_ref(struct branch *branch, const char *remote_na return branch->merge[0]->src; } -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; - int triangular = is_workflow_triangular(remote); + int triangular = remote != remote_get(NULL); const char *dst; switch (push_default) { From patchwork Sat May 29 07:44:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287749 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 30BC2C4708E for ; Sat, 29 May 2021 07:45:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0BBD9613CD for ; Sat, 29 May 2021 07:45:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229768AbhE2HrE (ORCPT ); Sat, 29 May 2021 03:47:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229783AbhE2Hq6 (ORCPT ); Sat, 29 May 2021 03:46:58 -0400 Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59283C061763 for ; Sat, 29 May 2021 00:45:20 -0700 (PDT) Received: by mail-oi1-x231.google.com with SMTP id z3so6678271oib.5 for ; Sat, 29 May 2021 00:45: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=q04OwyB+XP5puy2u1B8ZlN0ZHYZHOkCgfq6VrMZprVs=; b=iSGCywm6rSweCzm/aaDYtZclDL5QAchaC+Gd+9KvYJ9OPKeiY8D32bu5HEPK6qqVNM TyFSYn20c1Vm/h5ZrqIw+HQF/PTvO+nH6XreQ1EaqhCvMdFNMuBMf3HzQd9u00B5Y0fA e0xHS0CNQyN/WQyotchY3D+Q3VpB3yk0tVqBX1ZQCQo1U+r9GNMukup+jGs/Js0eDl2P B7jEJjOyXJuhALQftg6MGt94TiBRwmyo5WsHQLg2jx6avk+OJSkm3rSiL4BITZ2EZqa/ GUtTmNI9HSD0gUbpGOMnoXQV6oJP+4LftP4kX+AAzKx1C6fG3wUvlDJNTz4774tTrSWd WzsA== 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=q04OwyB+XP5puy2u1B8ZlN0ZHYZHOkCgfq6VrMZprVs=; b=RtiHhViVF94wgqHR213KXYJtOLc0Xmxp4q7eFgUE4LrljgIRs4wHcW6M8QHa6Ntfh2 ty0i6Nw2yrELVYGLT10ia95MYKvf1kn2gW0Mfj2F7Ypt1VpxCSD29sqp21haKtaYreHX LHsc8R3XbgCCaqEljN1zkx1J0+68SSewQF9t93QgQ0Ly/UKlQMIYKvfvUS7NSSM9fzBw sDec6/pHngNiktm2HPbECxlJbTkA9mEuwfjipawzQT9GLlAtCTtMM0KkvyNykBNt6SfZ 7IzGyBDAyc5ixdEA3J+i52fkyKnaCVIlYgElYE+gf+nUMSpGpv7SS+L6AKVMqH9p++fV YxbA== X-Gm-Message-State: AOAM531gzQ/8IRnEbTr6irtOlgA8Ldpa9wmZ4yR1hW9iaBOwgdmSRaLa +sJKxQdzU5Ed/GSP9/ybCf1G6Vh1xLMUig== X-Google-Smtp-Source: ABdhPJxCvMNDXQhHZwy/ILvwTptVvWIq9/LDNXmGlbEZDWnzpZEHRfjNUIYinsz0FaFukFsgfxXycg== X-Received: by 2002:a05:6808:128a:: with SMTP id a10mr11713524oiw.161.1622274319589; Sat, 29 May 2021 00:45:19 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id u201sm1621940oia.10.2021.05.29.00.45.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 00:45:19 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Brandon Williams , =?utf-8?q?Ren=C3=A9_Scharfe?= , Felipe Contreras Subject: [PATCH 13/15] push: only get triangular when needed Date: Sat, 29 May 2021 02:44:56 -0500 Message-Id: <20210529074458.1916817-14-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210529071115.1908310-1-felipe.contreras@gmail.com> References: <20210529071115.1908310-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Felipe Contreras --- builtin/push.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/push.c b/builtin/push.c index c220f70795..818ca4c5c9 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -205,8 +205,8 @@ static const char *get_upstream_ref(struct branch *branch, const char *remote_na static void setup_default_push_refspecs(struct remote *remote) { struct branch *branch; - int triangular = remote != remote_get(NULL); const char *dst; + int triangular; switch (push_default) { case PUSH_DEFAULT_MATCHING: @@ -225,6 +225,7 @@ static void setup_default_push_refspecs(struct remote *remote) die(_(message_detached_head_die), remote->name); dst = branch->refname; + triangular = remote != remote_get(NULL); switch (push_default) { default: From patchwork Sat May 29 07:44:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287747 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 04220C47082 for ; Sat, 29 May 2021 07:45:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DCB96613F0 for ; Sat, 29 May 2021 07:45:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229805AbhE2HrE (ORCPT ); Sat, 29 May 2021 03:47:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229762AbhE2Hq6 (ORCPT ); Sat, 29 May 2021 03:46:58 -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 016A2C061574 for ; Sat, 29 May 2021 00:45:22 -0700 (PDT) Received: by mail-ot1-x335.google.com with SMTP id 66-20020a9d02c80000b02903615edf7c1aso5721925otl.13 for ; Sat, 29 May 2021 00:45:21 -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=+cgXzv4KtFKLJ+JNpnvDYVJDcPRsqBQwnRu1/UlcV7c=; b=i/Dz95JIllV7GVuzpzma/FZrab9LaloLqZT0sZUgYV8us+xif6q0MZ4vgrNAewE5GE N7YJL/Gk927BBa943/9e1qBaPvbcdzGa9xeQhYUWsAyCPYNE3oL3hCyUZJGVUFYNHF9w 4GKS72s+poh3D69unImRY5+xD1rb/RdRlxxEZ9prPwrP+QZfnCg2vUeROuHMH+NANGrW Zfp2lzIlWCWG3nW8TZXhUgcHyv9qtfcFX8uWzA9M1GVCqcB/OKX+h4QOp5+BKG3pyiE+ 3maSARQuDgFM+kLzCodmvsWMMae73bqKjl+EdM5vTwX/SVOs1O6b5zoYxcIc1nUaKmhD vjWw== 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=+cgXzv4KtFKLJ+JNpnvDYVJDcPRsqBQwnRu1/UlcV7c=; b=HwGczRO4hClh3QizfYaLpJ45TegEu7zP+8Fx/PRHN+p3rrPxK02+cBRtXtnUZ9sodl sbMeRlh4V+zEP+bV7sSaliVfTfEHMwFSIOjsGOxyfvXWuCUfZ2YLhFiRcXK4mMF2hx+S xsIQLW/ZBqBiLTvxX3x23WWkvNixBf+x6mthOZGO5Wuvgh2KuksU/FUyb6cTWll9VL2P K8iPPRjKq1d87prEdzv4qd3Ex++noASwahxrOkuLC4w8WPMYcYvsxlP8PDIRNqzpOUQI qfbig0TY8j+VAQfq+B3X2+ejeLaqBB+t9G/7r++VXJKvdUDhc2h8FZx2K3AFGhA2eVbf lUBg== X-Gm-Message-State: AOAM532Ii9tIgd+G6/pHn1aG0spKY9/E5wVNRE0FcMib2rxiJe7uZCWn STngGgwnNi14Sx3X/RyJVv1BS0YV55rSww== X-Google-Smtp-Source: ABdhPJxUyur3VsJLoiZhpBxfGwZ857ofwFqswKF/RJtPWVPgi//SEL3pRbnX4JaHHbc+6qu82suW0Q== X-Received: by 2002:a9d:8a7:: with SMTP id 36mr9898281otf.287.1622274321153; Sat, 29 May 2021 00:45:21 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id m19sm1605022oov.10.2021.05.29.00.45.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 00:45:20 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Brandon Williams , =?utf-8?q?Ren=C3=A9_Scharfe?= , Felipe Contreras Subject: [PATCH 14/15] push: don't get a full remote object Date: Sat, 29 May 2021 02:44:57 -0500 Message-Id: <20210529074458.1916817-15-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210529071115.1908310-1-felipe.contreras@gmail.com> References: <20210529071115.1908310-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org All we need to know is that their names are different. 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 818ca4c5c9..2f30a97b97 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -225,7 +225,7 @@ static void setup_default_push_refspecs(struct remote *remote) die(_(message_detached_head_die), remote->name); dst = branch->refname; - triangular = remote != remote_get(NULL); + triangular = strcmp(remote->name, remote_for_branch(branch, NULL)); switch (push_default) { default: From patchwork Sat May 29 07:44:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12287753 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 A3374C47082 for ; Sat, 29 May 2021 07:45:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 851B061222 for ; Sat, 29 May 2021 07:45:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229823AbhE2HrH (ORCPT ); Sat, 29 May 2021 03:47:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229790AbhE2Hq7 (ORCPT ); Sat, 29 May 2021 03:46:59 -0400 Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B305C06174A for ; Sat, 29 May 2021 00:45:23 -0700 (PDT) Received: by mail-oi1-x231.google.com with SMTP id c3so6678182oic.8 for ; Sat, 29 May 2021 00:45: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=Lcl1Afq70BkK4usgPKmXnlNk6B0W42mPK5LncaeVQW0=; b=dI0SWbfapRB/W1f6mj9vcsdqG7Yrb0bUSadZ01L93iPND7aXvnfQp0ahKHfxN7+2OD TMqSd977deM2A4i/CLaevOrBwiT6sSehwgQ/gtsE6PopZiCezNXzCvoyd42JgqssXK0e EfGH3N7mHCIrRGF1RUsCQPRhYHTpm4hTpVJBO3Lttp9D8DxwfPin0V7HhSMkWOP17S+4 UVg5HDfzcFWBiqFAei+Hsj0McPMVlH7SlLUt2a4XTIYb6dc5RuvTLlAB2wGkRRtmWwMf cCCeEWA/cigNsU1J3Vg9CMhmz0YcsCK++oPmRtswTL9v8N+SbFXzDErr4us+TGBn4nG/ Uyrw== 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=Lcl1Afq70BkK4usgPKmXnlNk6B0W42mPK5LncaeVQW0=; b=I1ZpMAn8AP/WuJof4Cr4k6Ch3yVudog1UH43cr/0ztItbgMflB8xeB6jIeekLwz9F/ jqR6SWZSIzf1FjARypsZJNOU6jodbaiZQRRHZUVhjVfuQ0TBGgA82aZR5ZhwxKX+Lcgw jTRsO7BmAybZ0/0am+utjJpTuugao6HKP7Qv0I94RNlcSdrjX9LTDHlIvSqpxEFK2x/Q /fDan1QEPxf7h1XdQ+B57+ovu9qF04L6+Ea0Dojv+zCTYa2kdvFxUoCtbmuFglkpZnQ4 88AHLVCSTuYlAo55DzmoqK+q85GTNvOFpc28caCkFsnRSTy2BBcEQm8Fz0WBcob1oadT A0hA== X-Gm-Message-State: AOAM532jT2Q9JIx+FHDrz3NKrlZkq2Y11m6LCnVSyQr5Aio4bNKNQ6KX PxKxR6Exkdx5B+Ydu6d46YWAgiTS2NSZMw== X-Google-Smtp-Source: ABdhPJyVaCwVGauB6Oc+0LX049sTY6W6Tt6ikZ+mZyDa3SEluPm29si68eCJspS/dncbTOvplpL6gA== X-Received: by 2002:aca:ab50:: with SMTP id u77mr8440533oie.153.1622274322781; Sat, 29 May 2021 00:45:22 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id a7sm1624945ooo.9.2021.05.29.00.45.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 00:45:22 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Elijah Newren , Brandon Williams , =?utf-8?q?Ren=C3=A9_Scharfe?= , Felipe Contreras Subject: [PATCH 15/15] push: rename !triangular to same_remote Date: Sat, 29 May 2021 02:44:58 -0500 Message-Id: <20210529074458.1916817-16-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.32.0.rc0 In-Reply-To: <20210529071115.1908310-1-felipe.contreras@gmail.com> References: <20210529071115.1908310-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. Signed-off-by: Felipe Contreras --- builtin/push.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index 2f30a97b97..f1ac531252 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -206,7 +206,7 @@ static void setup_default_push_refspecs(struct remote *remote) { struct branch *branch; const char *dst; - int triangular; + int same_remote; switch (push_default) { case PUSH_DEFAULT_MATCHING: @@ -225,20 +225,20 @@ static void setup_default_push_refspecs(struct remote *remote) die(_(message_detached_head_die), remote->name); dst = branch->refname; - triangular = strcmp(remote->name, remote_for_branch(branch, NULL)); + same_remote = !strcmp(remote->name, remote_for_branch(branch, NULL)); switch (push_default) { default: case PUSH_DEFAULT_UNSPECIFIED: case PUSH_DEFAULT_SIMPLE: - if (triangular) + if (!same_remote) break; if (strcmp(branch->refname, get_upstream_ref(branch, remote->name))) die_push_simple(branch, remote); break; case PUSH_DEFAULT_UPSTREAM: - 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."),