From: Junio C Hamano <junkio@cox.net>
Date: Tue, 9 Aug 2005 02:31:37 +0000 (-0700)
Subject: Update rev-parse flags list.
X-Git-Tag: v0.99.4~3^2~10
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5ccfb758b0e69b77b0ad830cc35d7770b08589eb;p=git.git

Update rev-parse flags list.

I haven't audited the rev-parse users, but I am having a feeling
that many of them would choke when they expect a couple of SHA1
object names and malicious user feeds them "--max-count=6" or
somesuch to shoot himself in the foot.  Anyway, this adds a
couple of missing parameters that affect the list of revs to be
returned from rev-list, not the flags that affect how they are
presented by rev-list.  I think that is the intention, but I am
not quite sure.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/rev-parse.c b/rev-parse.c
index 1965e90a8..1c6ae76f9 100644
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -33,6 +33,9 @@ static int is_rev_argument(const char *arg)
 		"--max-age=",
 		"--min-age=",
 		"--merge-order",
+		"--topo-order",
+		"--bisect",
+		"--no-merges",
 		NULL
 	};
 	const char **p = rev_args;