summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Scott R Parish <srp@srparish.net>2007-10-27 01:36:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-10-29 20:51:36 -0700
commit3d7e2d857a570b1d6368285f95b67994fc95629e (patch)
treedc85c34b8b298faa3105f4fbe758bbdedd540714
parentCorrect handling of upload-pack in builtin-fetch-pack (diff)
downloadtgif-3d7e2d857a570b1d6368285f95b67994fc95629e.tar.xz
"git" returns 1; "git help" and "git help -a" return 0
Signed-off-by: Scott R Parish <srp@srparish.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin.h1
-rw-r--r--git.c7
-rw-r--r--help.c6
3 files changed, 8 insertions, 6 deletions
diff --git a/builtin.h b/builtin.h
index 65cc0fb34a..9a6213af12 100644
--- a/builtin.h
+++ b/builtin.h
@@ -6,6 +6,7 @@
extern const char git_version_string[];
extern const char git_usage_string[];
+extern void list_common_cmds_help(void);
extern void help_unknown_cmd(const char *cmd);
extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);
extern void prune_packed_objects(int);
diff --git a/git.c b/git.c
index 23a430c369..efed91c4f4 100644
--- a/git.c
+++ b/git.c
@@ -450,9 +450,10 @@ int main(int argc, const char **argv)
if (!prefixcmp(argv[0], "--"))
argv[0] += 2;
} else {
- /* Default command: "help" */
- argv[0] = "help";
- argc = 1;
+ /* The user didn't specify a command; give them help */
+ printf("usage: %s\n\n", git_usage_string);
+ list_common_cmds_help();
+ exit(1);
}
cmd = argv[0];
diff --git a/help.c b/help.c
index e5662d9014..daefa75ea0 100644
--- a/help.c
+++ b/help.c
@@ -147,7 +147,7 @@ static void list_commands(const char *exec_path, const char *pattern)
putchar('\n');
}
-static void list_common_cmds_help(void)
+void list_common_cmds_help(void)
{
int i, longest = 0;
@@ -203,14 +203,14 @@ int cmd_help(int argc, const char **argv, const char *prefix)
if (!help_cmd) {
printf("usage: %s\n\n", git_usage_string);
list_common_cmds_help();
- exit(1);
+ exit(0);
}
else if (!strcmp(help_cmd, "--all") || !strcmp(help_cmd, "-a")) {
printf("usage: %s\n\n", git_usage_string);
if(exec_path)
list_commands(exec_path, "git-*");
- exit(1);
+ exit(0);
}
else