Thread (59 messages) 59 messages, 5 authors, 2021-06-01

Re: [PATCH 11/15] push: fix Yoda condition

From: Junio C Hamano <hidden>
Date: 2021-05-31 06:45:08

Felipe Contreras [off-list ref] writes:
We want to check if remote is the same as the branch remote, not the
other way around.

Signed-off-by: Felipe Contreras <redacted>
---
 builtin/push.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
This is 10/15's making, and squashing them together will make both
the entire series (because doing so means that the reviewers need to
see one fewer step) and 10/15 (because the end result of the conversion
is more "logical") easier to review (and later read in "git log -p").
quoted hunk ↗ jump to hunk
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)
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help