[PATCH] Make sure we die if we don't get enough arguments.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen committed
Sep 12, 2005 at 23:31 UTC
206e587cb8ab22a9d264c20fb6299124a857281a
1 file changed
+3
git-merge-fredrik.py
+3
@@ -392,6 +392,9 @@ def usage():
392
# This strategy module figures out merge bases itself, so we only
393
# get heads.
394
395
+if len(sys.argv) < 4:
396
+ usage()
397
+
398
for nextArg in xrange(1, len(sys.argv)):
399
if sys.argv[nextArg] == '--':
400
if len(sys.argv) != nextArg + 3: