push: remove redundant check

felipec · gitster · commit 1afd78fb5c29 · 2021-06-02T10:12:02.000+09:00
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.

Also, fix the Yoda condition: we want to check if remote is the same as
the branch remote, not the other way around.

Signed-off-by: Felipe Contreras &lt;felipe.contreras@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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_same_remote(struct remote *remote)
 {
-	struct remote *fetch_remote = remote_get(NULL);
-	return (!fetch_remote || fetch_remote == remote);
+	return remote == remote_get(NULL);
 }
 
 static void setup_default_push_refspecs(struct remote *remote)

Original file line number	Diff line number	Diff line change
`@@ -204,8 +204,7 @@ static const char get_upstream_ref(struct branch branch, const char *remote_na`
`204`	`204`
`205`	`205`	`static int is_same_remote(struct remote *remote)`
`206`	`206`	`{`
`207`		`- struct remote *fetch_remote = remote_get(NULL);`
`208`		`- return (!fetch_remote \|\| fetch_remote == remote);`
	`207`	`+ return remote == remote_get(NULL);`
`209`	`208`	`}`
`210`	`209`
`211`	`210`	`static void setup_default_push_refspecs(struct remote *remote)`