diff options
| author | Fredrik Kuivinen <freku045@student.liu.se> | 2005-09-12 23:31:22 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-12 14:53:59 -0700 |
| commit | 206e587cb8ab22a9d264c20fb6299124a857281a (patch) | |
| tree | ccae51c357bf84f408ac02263703d2d411db9ffc | |
| parent | 654291a2acb1c28b884cb9376a0d7eb5f8c090b5 (diff) | |
| download | git-206e587cb8ab22a9d264c20fb6299124a857281a.tar.gz | |
[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>
| -rwxr-xr-x | git-merge-fredrik.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-merge-fredrik.py b/git-merge-fredrik.py index e4c6fe3c61..27b84867b0 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: |