From: Eric S. Raymond <esr@thyrsus.com>
Date: Thu, 18 Dec 2014 15:15:59 +0000 (-0500)
Subject: Allow -- as an argument ender in the diff command.
X-Git-Tag: 0.16~3
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=7090aee9f54b9acc675b6d94c772b14b4b6fe691;p=src.git

Allow -- as an argument ender in the diff command.
---

diff --git a/NEWS b/NEWS
index b16735f..c770954 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 			src project news
 
+Repository head:
+   Allow -- as an argument ender in src diff.
+
 0.15: 2014-12-08
    Deal gracefully with directories passed as arguments.
 
diff --git a/src b/src
index 23a9fcd..eee254e 100755
--- a/src
+++ b/src
@@ -1332,8 +1332,10 @@ def diff_method(*args):
     if type(args) == type(()):
         args = list(args)
     diffopts = ""
-    while args and args[0].startswith("-"):
+    while args and args[0] != '--' and args[0].startswith("-"):
         diffopts += " " + args.pop(0)
+    if args and args[0] == '--':
+        args.pop(0)
     if not diffopts:
         diffopts = "-u"
     for arg in ctx.args: