From: Fredrik Kuivinen <freku045@student.liu.se>
Date: Mon, 12 Sep 2005 21:31:22 +0000 (+0200)
Subject: [PATCH] Make sure we die if we don't get enough arguments.
X-Git-Tag: v0.99.7~64
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=206e587cb8ab22a9d264c20fb6299124a857281a;p=git.git

[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>
---

diff --git a/git-merge-fredrik.py b/git-merge-fredrik.py
index e4c6fe3c6..27b84867b 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: