git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 4/5] Make sure we die if we don't get enough arguments.

From
Fredrik Kuivinen <freku045@student.liu.se>
Date
Sep 12, 2005, 21:31 UTC
Message-ID
<20050912213122.GF6644@c165.ib.student.liu.se>
In-Reply-To
<20050912212601.GB6644@c165.ib.student.liu.se>
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
---
 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:
Previous: Fredrik KuivinenNext: Fredrik Kuivinen
Message 5 of 8 in “git-merge-fredrik updates”
  1. 0/5 git-merge-fredrik updatesFredrik Kuivinen, Sep 12, 2005
  2. 1/5 Fix assertion failure when merging common ancestors.Fredrik Kuivinen, Sep 12, 2005
  3. 2/5 Exit with status code 2 if we get an exception.Fredrik Kuivinen, Sep 12, 2005
  4. 3/5 Introduce a 'die' function.Fredrik Kuivinen, Sep 12, 2005
  5. 4/5 Make sure we die if we don't get enough arguments.Fredrik Kuivinen, Sep 12, 2005
  6. 5/5 Make the ProgramError class printable.Fredrik Kuivinen, Sep 12, 2005
  7. Junio C HamanoSep 12, 2005
  8. Rename the 'fredrik' merge strategy to 'recursive'.Fredrik Kuivinen, Sep 13, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.