From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH 03/43] config: use RUN_SETUP_GENTLY Date: Mon, 5 Apr 2010 20:40:48 +0200 Message-ID: <1270492888-26589-4-git-send-email-pclouds@gmail.com> References: <1270492888-26589-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , Junio C Hamano To: git@vger.kernel.org, Junio C Hamano , Jonathan Niedier X-From: git-owner@vger.kernel.org Mon Apr 05 20:42:25 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1NyrFc-0005ZJ-MJ for gcvg-git-2@lo.gmane.org; Mon, 05 Apr 2010 20:42:21 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755851Ab0DESlr convert rfc822-to-quoted-printable (ORCPT ); Mon, 5 Apr 2010 14:41:47 -0400 Received: from mail-fx0-f227.google.com ([209.85.220.227]:62876 "EHLO mail-fx0-f227.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755643Ab0DESlp (ORCPT ); Mon, 5 Apr 2010 14:41:45 -0400 Received: by mail-fx0-f227.google.com with SMTP id 27so1250782fxm.28 for ; Mon, 05 Apr 2010 11:41:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references:mime-version :content-type:content-transfer-encoding; bh=zRufo9Z2QTZNgOuvJpD8vHvIwtgBqyaO9MGCf9nop2U=; b=SF/u2cHesICYpgxM3XhXbX//I6iJ+Vmwie+FPqVKQLXeqiPvvD0rMbORsOvjDS2xE/ pDnR4QfQP+EGB104TP7gZz6QYLrK1AvXhjtJuAiUmBNNdNvPqf9BmWzMGB/tR218AJr9 RkHk3J/61rCX93pcNEuET2iOIuYEePgsW3dDA= 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 :mime-version:content-type:content-transfer-encoding; b=mzsNl4BzqQX4MrXtq5ntyEkU11Cu038wTrtO9HsXtlPRN9ltQcad55xtEDtIQ8oT7N TTbs5TUDmQ2/IQOYgOwjk/3iBbK+DZ9WX13mzBKJbdVKdmMSSSvpZcHMVA9zwTz6uZ/L KBl4wjATloRT8hqVereS/oUx69mhJg96ReIlo= Received: by 10.223.5.207 with SMTP id 15mr6105511faw.6.1270492904365; Mon, 05 Apr 2010 11:41:44 -0700 (PDT) Received: from dektop ([212.247.124.209]) by mx.google.com with ESMTPS id 22sm349493fkr.59.2010.04.05.11.41.41 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 05 Apr 2010 11:41:42 -0700 (PDT) Received: by dektop (sSMTP sendmail emulation); Mon, 5 Apr 2010 20:41:41 +0200 X-Mailer: git-send-email 1.7.0.rc1.541.g2da82.dirty In-Reply-To: <1270492888-26589-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy Signed-off-by: Junio C Hamano --- builtin/config.c | 6 ++---- git.c | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/builtin/config.c b/builtin/config.c index 4bc46b1..ecc8f87 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -326,11 +326,9 @@ static int get_colorbool(int print) return get_colorbool_found ? 0 : 1; } =20 -int cmd_config(int argc, const char **argv, const char *unused_prefix) +int cmd_config(int argc, const char **argv, const char *prefix) { - int nongit; char *value; - const char *prefix =3D setup_git_directory_gently(&nongit); =20 config_exclusive_filename =3D getenv(CONFIG_ENVIRONMENT); =20 @@ -409,7 +407,7 @@ int cmd_config(int argc, const char **argv, const c= har *unused_prefix) } else if (actions =3D=3D ACTION_EDIT) { check_argc(argc, 0, 0); - if (!config_exclusive_filename && nongit) + if (!config_exclusive_filename && !startup_info->have_repository) die("not in a git directory"); git_config(git_default_config, NULL); launch_editor(config_exclusive_filename ? diff --git a/git.c b/git.c index 9e0e2d0..4c99319 100644 --- a/git.c +++ b/git.c @@ -309,7 +309,7 @@ static void handle_internal_command(int argc, const= char **argv) { "clean", cmd_clean, RUN_SETUP | NEED_WORK_TREE }, { "commit", cmd_commit, RUN_SETUP | NEED_WORK_TREE }, { "commit-tree", cmd_commit_tree, RUN_SETUP }, - { "config", cmd_config }, + { "config", cmd_config, RUN_SETUP_GENTLY }, { "count-objects", cmd_count_objects, RUN_SETUP }, { "describe", cmd_describe, RUN_SETUP }, { "diff", cmd_diff }, @@ -366,7 +366,7 @@ static void handle_internal_command(int argc, const= char **argv) { "reflog", cmd_reflog, RUN_SETUP }, { "remote", cmd_remote, RUN_SETUP }, { "replace", cmd_replace, RUN_SETUP }, - { "repo-config", cmd_config }, + { "repo-config", cmd_config, RUN_SETUP_GENTLY }, { "rerere", cmd_rerere, RUN_SETUP }, { "reset", cmd_reset, RUN_SETUP }, { "rev-list", cmd_rev_list, RUN_SETUP }, --=20 1.7.0.rc1.541.g2da82.dirty