push: remove redundant check

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 <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/push.c b/builtin/push.c
index b5e951bf5946daa4c21e432407c340a66655c05b..aa22d6a8e596d62fee95ea40a2b53c0dfe0a0c7d 100644 (file)
--- 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)