From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johan Herland Subject: [RFCv2 05/12] Use a function to determine whether a remote is valid Date: Fri, 31 Jul 2009 12:00:25 +0200 Message-ID: <1249034432-31437-6-git-send-email-johan@herland.net> References: <1249034432-31437-1-git-send-email-johan@herland.net> Mime-Version: 1.0 Content-Type: TEXT/PLAIN Content-Transfer-Encoding: 7BIT Cc: Daniel Barkalow , gitster@pobox.com, Johan Herland To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Jul 31 12:03:03 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1MWox4-0008BK-6H for gcvg-git-2@gmane.org; Fri, 31 Jul 2009 12:03:02 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752042AbZGaKBh (ORCPT ); Fri, 31 Jul 2009 06:01:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752036AbZGaKBg (ORCPT ); Fri, 31 Jul 2009 06:01:36 -0400 Received: from mx.getmail.no ([84.208.15.66]:46136 "EHLO get-mta-out01.get.basefarm.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751630AbZGaKBd (ORCPT ); Fri, 31 Jul 2009 06:01:33 -0400 Received: from mx.getmail.no ([10.5.16.4]) by get-mta-out01.get.basefarm.net (Sun Java(tm) System Messaging Server 7.0-0.04 64bit (built Jun 20 2008)) with ESMTP id <0KNN00GDJ56L0220@get-mta-out01.get.basefarm.net> for git@vger.kernel.org; Fri, 31 Jul 2009 12:01:33 +0200 (MEST) Received: from localhost.localdomain ([84.215.102.95]) by get-mta-in01.get.basefarm.net (Sun Java(tm) System Messaging Server 7.0-0.04 64bit (built Jun 20 2008)) with ESMTP id <0KNN005FA55FU840@get-mta-in01.get.basefarm.net> for git@vger.kernel.org; Fri, 31 Jul 2009 12:01:33 +0200 (MEST) X-PMX-Version: 5.5.3.366731, Antispam-Engine: 2.7.0.366912, Antispam-Data: 2009.7.31.95120 X-Mailer: git-send-email 1.6.4.rc3.138.ga6b98.dirty In-reply-to: <1249034432-31437-1-git-send-email-johan@herland.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Daniel Barkalow Currently, it only checks url, but it will allow other things in the future. Signed-off-by: Daniel Barkalow Signed-off-by: Johan Herland --- remote.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/remote.c b/remote.c index 758727c..106151f 100644 --- a/remote.c +++ b/remote.c @@ -48,6 +48,11 @@ static int rewrite_nr; #define BUF_SIZE (2048) static char buffer[BUF_SIZE]; +static int valid_remote(const struct remote *remote) +{ + return !!remote->url; +} + static const char *alias_url(const char *url) { int i, j; @@ -669,14 +674,14 @@ struct remote *remote_get(const char *name) ret = make_remote(name, 0); if (valid_remote_nick(name)) { - if (!ret->url) + if (!valid_remote(ret)) read_remotes_file(ret); - if (!ret->url) + if (!valid_remote(ret)) read_branches_file(ret); } - if (name_given && !ret->url) + if (name_given && !valid_remote(ret)) add_url_alias(ret, name); - if (!ret->url) + if (!valid_remote(ret)) return NULL; ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec); ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec); -- 1.6.4.rc3.138.ga6b98.dirty