summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2006-09-14 01:04:09 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-09-14 18:48:11 (GMT)
commit5b6df8e45f31c7eb26c30536448cffe1b715e1ce (patch)
tree07277e193c5db09b3f9715bdc6d0a9ff1d294821 /merge-tree.c
parent7977f0ea53fad7103c83e5bd61777da27451f1d6 (diff)
downloadgit-5b6df8e45f31c7eb26c30536448cffe1b715e1ce.zip
git-5b6df8e45f31c7eb26c30536448cffe1b715e1ce.tar.gz
git-5b6df8e45f31c7eb26c30536448cffe1b715e1ce.tar.bz2
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>
Diffstat (limited to 'merge-tree.c')
-rw-r--r--merge-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-tree.c b/merge-tree.c
index c154dcf..692ede0 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();