git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 21/24] Let 'git <command> -h' show usage without a git dir

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Nov 9, 2009, 15:05 UTC
Message-ID
<1257779104-23884-21-git-send-email-jrnieder@gmail.com>
In-Reply-To
<20091109150235.GA23871@progeny.tock>

There is no need for "git <command> -h" to depend on being inside a repository.

Reported by Gerfried Fuchs through http://bugs.debian.org/462557
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 builtin-log.c       |    6 ++++++
 builtin-mv.c        |    8 ++++----
 builtin-read-tree.c |    4 ++--
 builtin-reflog.c    |    3 +++
 builtin-rerere.c    |    3 +++
 git.c               |   21 ++++++++++++---------
 index-pack.c        |    3 +++
 pack-redundant.c    |    3 +++
 8 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/builtin-log.c b/builtin-log.c
index 5248507..a0fa30c 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -50,6 +50,12 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
 	if (default_date_mode)
 		rev->date_mode = parse_date_format(default_date_mode);
 
+	/*
+	 * Check for -h before setup_revisions(), or "git log -h" will
+	 * fail when run without a git directory.
+	 */
+	if (argc == 2 && !strcmp(argv[1], "-h"))
+		usage(builtin_log_usage);
 	argc = setup_revisions(argc, argv, rev, "HEAD");
 
 	if (rev->diffopt.pickaxe || rev->diffopt.filter)
diff --git a/builtin-mv.c b/builtin-mv.c
index 1b20028..f633d81 100644
--- a/builtin-mv.c
+++ b/builtin-mv.c
@@ -64,15 +64,15 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 
 	git_config(git_default_config, NULL);
 
-	newfd = hold_locked_index(&lock_file, 1);
-	if (read_cache() < 0)
-		die("index file corrupt");
-
 	argc = parse_options(argc, argv, prefix, builtin_mv_options,
 			     builtin_mv_usage, 0);
 	if (--argc < 1)
 		usage_with_options(builtin_mv_usage, builtin_mv_options);
 
+	newfd = hold_locked_index(&lock_file, 1);
+	if (read_cache() < 0)
+		die("index file corrupt");
+
 	source = copy_pathspec(prefix, argv, argc, 0);
 	modes = xcalloc(argc, sizeof(enum update_mode));
 	dest_path = copy_pathspec(prefix, argv + argc, 1, 0);
diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 14c836b..2a3a32c 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -108,11 +108,11 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
 
 	git_config(git_default_config, NULL);
 
-	newfd = hold_locked_index(&lock_file, 1);
-
 	argc = parse_options(argc, argv, unused_prefix, read_tree_options,
 			     read_tree_usage, 0);
 
+	newfd = hold_locked_index(&lock_file, 1);
+
 	prefix_set = opts.prefix ? 1 : 0;
 	if (1 < opts.merge + opts.reset + prefix_set)
 		die("Which one? -m, --reset, or --prefix?");
diff --git a/builtin-reflog.c b/builtin-reflog.c
index e23b5ef..7498210 100644
--- a/builtin-reflog.c
+++ b/builtin-reflog.c
@@ -698,6 +698,9 @@ static const char reflog_usage[] =
 
 int cmd_reflog(int argc, const char **argv, const char *prefix)
 {
+	if (argc > 1 && !strcmp(argv[1], "-h"))
+		usage(reflog_usage);
+
 	/* With no command, we default to showing it. */
 	if (argc < 2 || *argv[1] == '-')
 		return cmd_log_reflog(argc, argv, prefix);
diff --git a/builtin-rerere.c b/builtin-rerere.c
index adfb7b5..343d6cd 100644
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -106,6 +106,9 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
 	if (argc < 2)
 		return rerere();
 
+	if (!strcmp(argv[1], "-h"))
+		usage(git_rerere_usage);
+
 	fd = setup_rerere(&merge_rr);
 	if (fd < 0)
 		return 0;
diff --git a/git.c b/git.c
index f295561..743ee57 100644
--- a/git.c
+++ b/git.c
@@ -229,21 +229,24 @@ struct cmd_struct {
 
 static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 {
-	int status;
+	int status, help;
 	struct stat st;
 	const char *prefix;
 
 	prefix = NULL;
-	if (p->option & RUN_SETUP)
-		prefix = setup_git_directory();
-
-	if (use_pager == -1 && p->option & RUN_SETUP)
-		use_pager = check_pager_config(p->cmd);
-	if (use_pager == -1 && p->option & USE_PAGER)
-		use_pager = 1;
+	help = argc == 2 && !strcmp(argv[1], "-h");
+	if (!help) {
+		if (p->option & RUN_SETUP)
+			prefix = setup_git_directory();
+
+		if (use_pager == -1 && p->option & RUN_SETUP)
+			use_pager = check_pager_config(p->cmd);
+		if (use_pager == -1 && p->option & USE_PAGER)
+			use_pager = 1;
+	}
 	commit_pager_choice();
 
-	if (p->option & NEED_WORK_TREE)
+	if (!help && p->option & NEED_WORK_TREE)
 		setup_work_tree();
 
 	trace_argv_printf(argv, "trace: built-in: git");
diff --git a/index-pack.c b/index-pack.c
index b4f8278..190f372 100644
--- a/index-pack.c
+++ b/index-pack.c
@@ -882,6 +882,9 @@ int main(int argc, char **argv)
 
 	git_extract_argv0_path(argv[0]);
 
+	if (argc == 2 && !strcmp(argv[1], "-h"))
+		usage(index_pack_usage);
+
 	/*
 	 * We wish to read the repository's config file if any, and
 	 * for that it is necessary to call setup_git_directory_gently().
diff --git a/pack-redundant.c b/pack-redundant.c
index 69a7ab2..21c61db 100644
--- a/pack-redundant.c
+++ b/pack-redundant.c
@@ -603,6 +603,9 @@ int main(int argc, char **argv)
 
 	git_extract_argv0_path(argv[0]);
 
+	if (argc == 2 && !strcmp(argv[1], "-h"))
+		usage(pack_redundant_usage);
+
 	setup_git_directory();
 
 	for (i = 1; i < argc; i++) {

-- 
1.6.5.2
Previous: Jonathan NiederNext: Jonathan Nieder
Message 35 of 39 in “Let 'git <command> -h' show usage without a git dir”
  1. Let 'git <command> -h' show usage without a git dirJonathan Nieder, Nov 8, 2009
  2. Show usage string for 'git http-push -h'Jonathan Nieder, Nov 8, 2009
  3. Tay Ray ChuanNov 9, 2009
  4. Show usage string for 'git http-push -h'Jonathan Nieder, Nov 9, 2009
  5. Tay Ray ChuanNov 9, 2009
  6. Junio C HamanoNov 8, 2009
  7. Jonathan NiederNov 8, 2009
  8. 00/24 Let 'git <command> -h' show usage without a git dirJonathan Nieder, Nov 9, 2009
  9. 01/24 Retire fetch--tool helper to contrib/examplesJonathan Nieder, Nov 9, 2009
  10. 02/24 Show usage string for 'git grep -h'Jonathan Nieder, Nov 9, 2009
  11. 03/24 Show usage string for 'git cherry -h'Jonathan Nieder, Nov 9, 2009
  12. 04/24 Show usage string for 'git commit-tree -h'Jonathan Nieder, Nov 9, 2009
  13. 05/24 Show usage string for 'git merge-ours -h'Jonathan Nieder, Nov 9, 2009
  14. 06/24 Show usage string for 'git show-ref -h'Jonathan Nieder, Nov 9, 2009
  15. 07/24 check-ref-format: update usage stringJonathan Nieder, Nov 9, 2009
  16. Junio C HamanoNov 10, 2009
  17. 08/24 Show usage string for 'git check-ref-format -h'Jonathan Nieder, Nov 9, 2009
  18. 09/24 Show usage string for 'git fast-import -h'Jonathan Nieder, Nov 9, 2009
  19. 10/24 Show usage string for 'git get-tar-commit-id -h'Jonathan Nieder, Nov 9, 2009
  20. 11/24 Show usage string for 'git imap-send -h'Jonathan Nieder, Nov 9, 2009
  21. 12/24 Show usage string for 'git mailsplit -h'Jonathan Nieder, Nov 9, 2009
  22. 13/24 Show usage string for 'git merge-one-file -h'Jonathan Nieder, Nov 9, 2009
  23. 14/24 Show usage string for 'git rev-parse -h'Jonathan Nieder, Nov 9, 2009
  24. 15/24 Show usage string for 'git show-index -h'Jonathan Nieder, Nov 9, 2009
  25. 16/24 Show usage string for 'git unpack-file -h'Jonathan Nieder, Nov 9, 2009
  26. 17/24 Show usage string for 'git stripspace -h'Jonathan Nieder, Nov 9, 2009
  27. 18/24 merge: do not setup worktree twiceJonathan Nieder, Nov 9, 2009
  28. Junio C HamanoNov 10, 2009
  29. Jonathan NiederNov 11, 2009
  30. 19/24 Let 'git http-fetch -h' show usage outside any git repositoryJonathan Nieder, Nov 9, 2009
  31. 20/24 http-fetch: add missing initialization of argv0_pathJonathan Nieder, Nov 9, 2009
  32. Junio C HamanoNov 10, 2009
  33. Johannes SixtNov 10, 2009
  34. Jonathan NiederNov 11, 2009
  35. 21/24 Let 'git <command> -h' show usage without a git dirJonathan Nieder, Nov 9, 2009
  36. 22/24 Let usage() take a printf-style formatJonathan Nieder, Nov 9, 2009
  37. Junio C HamanoNov 10, 2009
  38. 23/24 merge-{recursive,subtree}: use usage() to print usageJonathan Nieder, Nov 9, 2009
  39. 24/24 diff --no-index: make the usage string less scaryJonathan Nieder, Nov 9, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.