From 5b6df8e45f31c7eb26c30536448cffe1b715e1ce Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Thu, 14 Sep 2006 05:04:09 +0400 Subject: 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 --- merge-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'merge-tree.c') diff --git a/merge-tree.c b/merge-tree.c index c154dcfc02..692ede0e3d 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(); -- cgit v1.2.3