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>

1 files changed, 1 insertions, 1 deletions

diff --git a/describe.c b/describe.c
index 5ed052d..ab192f8 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) {