From: Fredrik Kuivinen Date: Mon, 12 Sep 2005 21:31:22 GMT Subject: [PATCH 4/5] Make sure we die if we don't get enough arguments. Message-ID: <20050912213122.GF6644@c165.ib.student.liu.se> In-Reply-To: <20050912212601.GB6644@c165.ib.student.liu.se> Signed-off-by: Fredrik Kuivinen --- git-merge-fredrik.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) 573c3e6f61eb2cb27b5d67f7a24f01a74980c769 diff --git a/git-merge-fredrik.py b/git-merge-fredrik.py --- 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: