From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Contreras Subject: [PATCH 2/8] config: Cleanup config file handling. Date: Sun, 15 Feb 2009 11:00:54 +0200 Message-ID: <1234688460-9248-2-git-send-email-felipe.contreras@gmail.com> References: <1234688460-9248-1-git-send-email-felipe.contreras@gmail.com> Cc: Johannes Schindelin , Junio C Hamano , Felipe Contreras To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Feb 15 10:03:26 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 1LYcuD-0000wm-L1 for gcvg-git-2@gmane.org; Sun, 15 Feb 2009 10:03:18 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751609AbZBOJBO (ORCPT ); Sun, 15 Feb 2009 04:01:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751512AbZBOJBN (ORCPT ); Sun, 15 Feb 2009 04:01:13 -0500 Received: from mail-fx0-f20.google.com ([209.85.220.20]:54154 "EHLO mail-fx0-f20.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751445AbZBOJBM (ORCPT ); Sun, 15 Feb 2009 04:01:12 -0500 Received: by fxm13 with SMTP id 13so4790431fxm.13 for ; Sun, 15 Feb 2009 01:01:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=Hbh6d2WU83yLklH3UccnZ0rTnQTgPAbLkptwe7BK7TU=; b=AxDIqf0kvBd0pn8iFMkEMfxwyYpSW7km/hsnQjF1fySfZ63dIXbBefUm2jPND7wDW3 Poi39xpewZ6xJIu0J2i0doCRKXiVdDAqaQniIl+YdDTaGu4EP8ciC2c1FYhWoI+rReYd 3sABXmWm3/2sow/FpMTKqwUyZym3LN5MOaFPc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=WiNQ0z3XvrKF72J7E98IfsVcoIBiBgywdCGPQd2f3l5K54h127P6DkKFg+AcvZ8swK e0lg7mgnldo5WB6znEpCUh8Kn5M39sJbxpyxFH+rJ48H0cTnHMvrnNpobQi7tzywIZ0/ 8QPjCdMGHSirI4/io5gSZcNjVzvExdBwmNv48= Received: by 10.181.135.5 with SMTP id m5mr1475423bkn.33.1234688469034; Sun, 15 Feb 2009 01:01:09 -0800 (PST) Received: from localhost (a91-153-251-222.elisa-laajakaista.fi [91.153.251.222]) by mx.google.com with ESMTPS id p9sm5667095fkb.21.2009.02.15.01.01.08 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 15 Feb 2009 01:01:08 -0800 (PST) X-Mailer: git-send-email 1.6.1.3 In-Reply-To: <1234688460-9248-1-git-send-email-felipe.contreras@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: As suggested by Johannes Schindelin. Signed-off-by: Felipe Contreras --- builtin-config.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/builtin-config.c b/builtin-config.c index bf8df58..da754e0 100644 --- a/builtin-config.c +++ b/builtin-config.c @@ -282,11 +282,11 @@ static int get_colorbool(int argc, const char **argv) } } -int cmd_config(int argc, const char **argv, const char *prefix) +int cmd_config(int argc, const char **argv, const char *unused_prefix) { int nongit; char* value; - const char *file = setup_git_directory_gently(&nongit); + const char *prefix = setup_git_directory_gently(&nongit); config_exclusive_filename = getenv(CONFIG_ENVIRONMENT); @@ -300,10 +300,8 @@ int cmd_config(int argc, const char **argv, const char *prefix) else if (!strcmp(argv[1], "--list") || !strcmp(argv[1], "-l")) { if (argc != 2) usage(git_config_set_usage); - if (git_config(show_all_config, NULL) < 0 && - file && errno) - die("unable to read config file %s: %s", file, - strerror(errno)); + if (git_config(show_all_config, NULL) < 0) + die("error processing config file(s)"); return 0; } else if (!strcmp(argv[1], "--global")) { @@ -320,12 +318,12 @@ int cmd_config(int argc, const char **argv, const char *prefix) else if (!strcmp(argv[1], "--file") || !strcmp(argv[1], "-f")) { if (argc < 3) usage(git_config_set_usage); - if (!is_absolute_path(argv[2]) && file) - file = prefix_filename(file, strlen(file), - argv[2]); + if (!is_absolute_path(argv[2]) && prefix) + config_exclusive_filename = prefix_filename(prefix, + strlen(prefix), + argv[2]); else - file = argv[2]; - config_exclusive_filename = file; + config_exclusive_filename = argv[2]; argc--; argv++; } -- 1.6.1.3