Currently the only supported value is "nomerges". This allows one to filter
merges from many actions, like rss, log and shortlog.
Signed-off-by: Miklos Vajna <vmiklos@xxxxxxxxxxxxxx>
---
gitweb/gitweb.perl | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index dc609f4..ce592cf 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -383,6 +383,13 @@ if (defined $hash_base) {
}
}
+our $filter = $cgi->param('filter');
+if (defined $filter) {
+ if ($filter != "nomerges") {
+ die_error(undef, "Invalid filter parameter");
+ }
+}
+
our $hash_parent_base = $cgi->param('hpb');
if (defined $hash_parent_base) {
if (!validate_refname($hash_parent_base)) {
@@ -534,6 +541,7 @@ sub href(%) {
action => "a",
file_name => "f",
file_parent => "fp",
+ filter => "filter",
hash => "h",
hash_parent => "hp",
hash_base => "hb",
@@ -1770,6 +1778,7 @@ sub parse_commits {
($arg ? ($arg) : ()),
("--max-count=" . $maxcount),
("--skip=" . $skip),
+ ((defined $filter and $filter == "nomerges") ? ("--no-merges") : ()),
$commit_id,
"--",
($filename ? ($filename) : ())
--
1.5.3.rc0.39.g46f7-dirty
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
