From 206e587cb8ab22a9d264c20fb6299124a857281a Mon Sep 17 00:00:00 2001 From: Fredrik Kuivinen Date: Mon, 12 Sep 2005 23:31:22 +0200 Subject: [PATCH] [PATCH] Make sure we die if we don't get enough arguments. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano --- git-merge-fredrik.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git-merge-fredrik.py b/git-merge-fredrik.py index e4c6fe3c..27b84867 100755 --- a/git-merge-fredrik.py +++ b/git-merge-fredrik.py @@ -392,6 +392,9 @@ def usage(): # This strategy module figures out merge bases itself, so we only # get heads. +if len(sys.argv) < 4: + usage() + for nextArg in xrange(1, len(sys.argv)): if sys.argv[nextArg] == '--': if len(sys.argv) != nextArg + 3: -- 2.11.0