git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
	Jonathan Niedier <jrnieder@gmail.com>
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
	"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH 42/43] builtins: setup repository before print unknown command error
Date: Mon,  5 Apr 2010 20:41:27 +0200	[thread overview]
Message-ID: <1270492888-26589-43-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1270492888-26589-1-git-send-email-pclouds@gmail.com>

help_unknown_cmd() will need to look into repository's config, in
order to collect all possible commands/aliases and give a
suggestion. So, repository must be set up before this function is
called.

As it is now, because
 - alias handling will always be done before help_unknown_cmd()
 - alias handling code will search and set up repository if found
 - alias handline code will not undo repository setup

These ensure that repository will always be set up (or attempted to
set up) before help_unknown_cmd(), so there is no issue. But the setup
dependency here is subtle. It may break some day if someone reorders
the loop, for example.

Make a note about this.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 git.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/git.c b/git.c
index 43cebd7..1fb478f 100644
--- a/git.c
+++ b/git.c
@@ -555,6 +555,13 @@ int main(int argc, const char **argv)
 			exit(1);
 		}
 		if (!done_help) {
+			/*
+			 * help_unknown_cmd() requires that a repository has been
+			 * searched for and set up if found.
+			 * Luckily, the alias handling code already took care of this.
+			 */
+			if (!startup_info->have_run_setup_gitdir)
+				die("internal error: handling unknown command");
 			cmd = argv[0] = help_unknown_cmd(cmd);
 			done_help = 1;
 		} else
-- 
1.7.0.rc1.541.g2da82.dirty

  parent reply	other threads:[~2010-04-05 18:44 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-05 18:40 [PATCH 00/43] nd/setup update Nguyễn Thái Ngọc Duy
2010-04-05 18:40 ` [PATCH 01/43] builtin: introduce startup_info struct Nguyễn Thái Ngọc Duy
2010-04-05 18:40 ` [PATCH 02/43] builtin: Support RUN_SETUP_GENTLY to set up repository early if found Nguyễn Thái Ngọc Duy
2010-04-05 18:40 ` [PATCH 03/43] config: use RUN_SETUP_GENTLY Nguyễn Thái Ngọc Duy
2010-04-05 18:40 ` [PATCH 04/43] hash-object: " Nguyễn Thái Ngọc Duy
2010-04-05 18:40 ` [PATCH 05/43] shortlog: " Nguyễn Thái Ngọc Duy
2010-04-05 18:40 ` [PATCH 06/43] grep: " Nguyễn Thái Ngọc Duy
2010-04-05 18:40 ` [PATCH 07/43] builtin: USE_PAGER should not be used without RUN_SETUP* Nguyễn Thái Ngọc Duy
2010-04-05 18:40 ` [PATCH 08/43] archive: use RUN_SETUP_GENTLY Nguyễn Thái Ngọc Duy
2010-04-05 18:40 ` [PATCH 09/43] mailinfo: " Nguyễn Thái Ngọc Duy
2010-04-05 18:40 ` [PATCH 10/43] check-ref-format: " Nguyễn Thái Ngọc Duy
2010-04-05 18:40 ` [PATCH 11/43] verify-pack: " Nguyễn Thái Ngọc Duy
2010-04-05 18:40 ` [PATCH 12/43] apply: " Nguyễn Thái Ngọc Duy
2010-04-05 18:40 ` [PATCH 13/43] bundle: " Nguyễn Thái Ngọc Duy
2010-04-05 18:40 ` [PATCH 14/43] diff: " Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 15/43] help: take note why this command is not applicable for RUN_SETUP_GENTLY Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 16/43] ls-remote: use RUN_SETUP_GENTLY Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 17/43] var: " Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 18/43] merge-file: " Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 19/43] worktree setup: calculate prefix even if no worktree is found Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 20/43] index-pack: trust the prefix returned by setup_git_directory_gently() Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 21/43] index-pack: use RUN_SETUP_GENTLY Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 22/43] Move enter_repo() to setup.c Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 23/43] enter_repo(): initialize other variables as setup_git_directory_gently() does Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 24/43] rev-parse --git-dir: print relative gitdir correctly Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 25/43] worktree setup: call set_git_dir explicitly Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 26/43] Add git_config_early() Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 27/43] Use git_config_early() instead of git_config() during repo setup Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 28/43] worktree setup: restore original state when things go wrong Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 29/43] init/clone: turn on startup->have_repository properly Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 30/43] git_config(): do not read .git/config if there is no repository Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 31/43] Do not read .git/info/exclude " Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 32/43] Do not read .git/info/attributes " Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 33/43] apply: do not check sha1 " Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 34/43] config: do not read .git/config " Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 35/43] run_builtin(): save "-h" detection result for later use Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 36/43] builtins: utilize startup_info->help where possible Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 37/43] builtins: check for startup_info->help, print and exit early Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 38/43] Allow to undo setup_git_directory_gently() gracefully (and fix alias code) Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 39/43] alias: keep repository found while collecting aliases as long as possible Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 40/43] Guard unallowed access to repository when it's not set up Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` [PATCH 41/43] t0001: Add test cases for "git init" with aliases Nguyễn Thái Ngọc Duy
2010-04-05 18:41 ` Nguyễn Thái Ngọc Duy [this message]
2010-04-05 18:41 ` [PATCH 43/43] builtins: do not commit pager choice early Nguyễn Thái Ngọc Duy
2010-04-06  4:01   ` [PATCH 0/2] fix weird git --paginate behavior Jonathan Nieder
2010-04-06  4:03     ` [PATCH 1/2] t7006: test core.pager configuration in subdir of toplevel Jonathan Nieder
2010-04-06  4:06     ` [PATCH 2/2] builtins: do not commit pager choice early Jonathan Nieder
2010-04-06  4:16       ` Jonathan Nieder
2010-04-06  7:00     ` [PATCH 0/2] fix weird git --paginate behavior Nguyen Thai Ngoc Duy
2010-04-06  7:17     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1270492888-26589-43-git-send-email-pclouds@gmail.com \
    --to=pclouds@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).