From 5b6df8e45f31c7eb26c30536448cffe1b715e1ce Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Thu, 14 Sep 2006 05:04:09 +0400 Subject: [PATCH] Handle invalid argc gently describe, git: Handle argc==0 case the same way as argc==1. merge-tree: Refuse excessive arguments. Signed-off-by: Dmitry V. Levin Signed-off-by: Junio C Hamano --- describe.c | 2 +- git.c | 2 +- merge-tree.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/describe.c b/describe.c index 5ed052d3a..ab192f83a 100644 --- a/describe.c +++ b/describe.c @@ -163,7 +163,7 @@ int main(int argc, char **argv) setup_git_directory(); - if (i == argc) + if (argc <= i) describe("HEAD", 1); else while (i < argc) { diff --git a/git.c b/git.c index 47c85e10d..8c182a5f5 100644 --- a/git.c +++ b/git.c @@ -294,7 +294,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp) int main(int argc, const char **argv, char **envp) { - const char *cmd = argv[0]; + const char *cmd = argv[0] ? argv[0] : "git-help"; char *slash = strrchr(cmd, '/'); const char *exec_path = NULL; int done_alias = 0; diff --git a/merge-tree.c b/merge-tree.c index c154dcfc0..692ede0e3 100644 --- a/merge-tree.c +++ b/merge-tree.c @@ -337,7 +337,7 @@ int main(int argc, char **argv) struct tree_desc t[3]; void *buf1, *buf2, *buf3; - if (argc < 4) + if (argc != 4) usage(merge_tree_usage); setup_git_directory(); -- 2.26.2