git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Elijah Newren" <newren@gmail.com>,
	"Mathias Kunter" <mathiaskunter@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Ramkumar Ramachandra" <r@artagnon.com>,
	"Jeff King" <peff@peff.net>, "René Scharfe" <l.s.r@web.de>,
	"Matthieu Moy" <git@matthieu-moy.fr>,
	"Junio C Hamano" <gitster@pobox.com>,
	"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH 09/11] push: remove trivial function
Date: Fri, 28 May 2021 15:10:12 -0500	[thread overview]
Message-ID: <20210528201014.2175179-10-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210528201014.2175179-1-felipe.contreras@gmail.com>

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 <felipe.contreras@gmail.com>
---
 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:
-- 
2.32.0.rc0


  parent reply	other threads:[~2021-05-28 20:10 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-28 20:10 [PATCH 00/11] Unconvolutize push.default=simple Felipe Contreras
2021-05-28 20:10 ` [PATCH 01/11] push: hedge code of default=simple Felipe Contreras
2021-05-28 20:10 ` [PATCH 02/11] push: move code to setup_push_simple() Felipe Contreras
2021-05-28 20:10 ` [PATCH 03/11] push: reorganize setup_push_simple() Felipe Contreras
2021-05-28 20:52   ` Elijah Newren
2021-05-28 21:27     ` Felipe Contreras
2021-05-28 21:42       ` Elijah Newren
2021-05-28 20:10 ` [PATCH 04/11] push: simplify setup_push_simple() Felipe Contreras
2021-05-28 20:57   ` Elijah Newren
2021-05-28 21:28     ` Felipe Contreras
2021-05-28 20:10 ` [PATCH 05/11] push: remove unused code in setup_push_upstream() Felipe Contreras
2021-05-28 20:10 ` [PATCH 06/11] push: merge current and simple Felipe Contreras
2021-05-28 20:10 ` [PATCH 07/11] push: remove redundant check Felipe Contreras
2021-05-28 20:10 ` [PATCH 08/11] push: fix Yoda condition Felipe Contreras
2021-05-28 20:10 ` Felipe Contreras [this message]
2021-05-28 20:10 ` [PATCH 10/11] push: flip !triangular for centralized Felipe Contreras
2021-05-28 21:05   ` Elijah Newren
2021-05-28 21:57     ` Felipe Contreras
2021-05-28 20:10 ` [PATCH 11/11] doc: push: explain default=simple correctly Felipe Contreras
2021-05-28 21:07   ` Elijah Newren
2021-05-29  5:38   ` Bagas Sanjaya
2021-05-28 21:17 ` [PATCH 00/11] Unconvolutize push.default=simple Elijah Newren
2021-05-28 22:21   ` Felipe Contreras
2021-05-28 22:28     ` Elijah Newren

Reply instructions:

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

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

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

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

  git send-email \
    --in-reply-to=20210528201014.2175179-10-felipe.contreras@gmail.com \
    --to=felipe.contreras@gmail.com \
    --cc=avarab@gmail.com \
    --cc=git@matthieu-moy.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=l.s.r@web.de \
    --cc=mathiaskunter@gmail.com \
    --cc=newren@gmail.com \
    --cc=peff@peff.net \
    --cc=r@artagnon.com \
    /path/to/YOUR_REPLY

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

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