diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2006-09-14 05:04:09 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-14 11:48:11 -0700 |
| commit | 5b6df8e45f31c7eb26c30536448cffe1b715e1ce (patch) | |
| tree | 07277e193c5db09b3f9715bdc6d0a9ff1d294821 | |
| parent | 7977f0ea53fad7103c83e5bd61777da27451f1d6 (diff) | |
| download | git-5b6df8e45f31c7eb26c30536448cffe1b715e1ce.tar.gz git-5b6df8e45f31c7eb26c30536448cffe1b715e1ce.tar.xz | |
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 <ldv@altlinux.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | describe.c | 2 | ||||
| -rw-r--r-- | git.c | 2 | ||||
| -rw-r--r-- | 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) { @@ -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(); |