summaryrefslogtreecommitdiff
path: root/rev-parse.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-09 02:31:37 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-10 05:28:21 (GMT)
commit5ccfb758b0e69b77b0ad830cc35d7770b08589eb (patch)
tree6e7d43347cd68f2fd08e70b0280b76588102c3cd /rev-parse.c
parent76cd8eb619cf2896b5171d46d6bbf8e97d19e728 (diff)
downloadgit-5ccfb758b0e69b77b0ad830cc35d7770b08589eb.zip
git-5ccfb758b0e69b77b0ad830cc35d7770b08589eb.tar.gz
git-5ccfb758b0e69b77b0ad830cc35d7770b08589eb.tar.bz2
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>
Diffstat (limited to 'rev-parse.c')
-rw-r--r--rev-parse.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/rev-parse.c b/rev-parse.c
index 1965e90..1c6ae76 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;