Merge branch 'maint'
* maint: gitweb: Include links to feeds in HTML header only for '200 OK' response fsck docs: remove outdated and useless diagnostic userdiff: fix typo in ruby and python word regexes trace.c: mark file-local function static Fix typo in git-gc document.
This commit is contained in:
Junio C Hamano
@ -996,7 +996,7 @@ gc.packrefs::
|
||||
Running `git pack-refs` in a repository renders it
|
||||
unclonable by Git versions prior to 1.5.1.2 over dumb
|
||||
transports such as HTTP. This variable determines whether
|
||||
'git gc' runs `git pack-refs`. This can be set to `nobare`
|
||||
'git gc' runs `git pack-refs`. This can be set to `notbare`
|
||||
to enable it within all non-bare repos or it can be set to a
|
||||
boolean value. The default is `true`.
|
||||
|
||||
|
||||
@ -123,9 +123,6 @@ dangling <type> <object>::
|
||||
The <type> object <object>, is present in the database but never
|
||||
'directly' used. A dangling commit could be a root node.
|
||||
|
||||
warning: git-fsck: tree <tree> has full pathnames in it::
|
||||
And it shouldn't...
|
||||
|
||||
sha1 mismatch <object>::
|
||||
The database has an object who's sha1 doesn't match the
|
||||
database value.
|
||||
|
||||
@ -107,7 +107,7 @@ how long records of conflicted merge you have not resolved are
|
||||
kept. This defaults to 15 days.
|
||||
|
||||
The optional configuration variable 'gc.packrefs' determines if
|
||||
'git gc' runs 'git pack-refs'. This can be set to "nobare" to enable
|
||||
'git gc' runs 'git pack-refs'. This can be set to "notbare" to enable
|
||||
it within all non-bare repos or it can be set to a boolean value.
|
||||
This defaults to true.
|
||||
|
||||
|
||||
@ -3479,6 +3479,51 @@ sub get_page_title {
|
||||
return $title;
|
||||
}
|
||||
|
||||
sub print_feed_meta {
|
||||
if (defined $project) {
|
||||
my %href_params = get_feed_info();
|
||||
if (!exists $href_params{'-title'}) {
|
||||
$href_params{'-title'} = 'log';
|
||||
}
|
||||
|
||||
foreach my $format qw(RSS Atom) {
|
||||
my $type = lc($format);
|
||||
my %link_attr = (
|
||||
'-rel' => 'alternate',
|
||||
'-title' => esc_attr("$project - $href_params{'-title'} - $format feed"),
|
||||
'-type' => "application/$type+xml"
|
||||
);
|
||||
|
||||
$href_params{'action'} = $type;
|
||||
$link_attr{'-href'} = href(%href_params);
|
||||
print "<link ".
|
||||
"rel=\"$link_attr{'-rel'}\" ".
|
||||
"title=\"$link_attr{'-title'}\" ".
|
||||
"href=\"$link_attr{'-href'}\" ".
|
||||
"type=\"$link_attr{'-type'}\" ".
|
||||
"/>\n";
|
||||
|
||||
$href_params{'extra_options'} = '--no-merges';
|
||||
$link_attr{'-href'} = href(%href_params);
|
||||
$link_attr{'-title'} .= ' (no merges)';
|
||||
print "<link ".
|
||||
"rel=\"$link_attr{'-rel'}\" ".
|
||||
"title=\"$link_attr{'-title'}\" ".
|
||||
"href=\"$link_attr{'-href'}\" ".
|
||||
"type=\"$link_attr{'-type'}\" ".
|
||||
"/>\n";
|
||||
}
|
||||
|
||||
} else {
|
||||
printf('<link rel="alternate" title="%s projects list" '.
|
||||
'href="%s" type="text/plain; charset=utf-8" />'."\n",
|
||||
esc_attr($site_name), href(project=>undef, action=>"project_index"));
|
||||
printf('<link rel="alternate" title="%s projects feeds" '.
|
||||
'href="%s" type="text/x-opml" />'."\n",
|
||||
esc_attr($site_name), href(project=>undef, action=>"opml"));
|
||||
}
|
||||
}
|
||||
|
||||
sub git_header_html {
|
||||
my $status = shift || "200 OK";
|
||||
my $expires = shift;
|
||||
@ -3528,48 +3573,8 @@ EOF
|
||||
print '<link rel="stylesheet" type="text/css" href="'.esc_url($stylesheet).'"/>'."\n";
|
||||
}
|
||||
}
|
||||
if (defined $project) {
|
||||
my %href_params = get_feed_info();
|
||||
if (!exists $href_params{'-title'}) {
|
||||
$href_params{'-title'} = 'log';
|
||||
}
|
||||
|
||||
foreach my $format qw(RSS Atom) {
|
||||
my $type = lc($format);
|
||||
my %link_attr = (
|
||||
'-rel' => 'alternate',
|
||||
'-title' => esc_attr("$project - $href_params{'-title'} - $format feed"),
|
||||
'-type' => "application/$type+xml"
|
||||
);
|
||||
|
||||
$href_params{'action'} = $type;
|
||||
$link_attr{'-href'} = href(%href_params);
|
||||
print "<link ".
|
||||
"rel=\"$link_attr{'-rel'}\" ".
|
||||
"title=\"$link_attr{'-title'}\" ".
|
||||
"href=\"$link_attr{'-href'}\" ".
|
||||
"type=\"$link_attr{'-type'}\" ".
|
||||
"/>\n";
|
||||
|
||||
$href_params{'extra_options'} = '--no-merges';
|
||||
$link_attr{'-href'} = href(%href_params);
|
||||
$link_attr{'-title'} .= ' (no merges)';
|
||||
print "<link ".
|
||||
"rel=\"$link_attr{'-rel'}\" ".
|
||||
"title=\"$link_attr{'-title'}\" ".
|
||||
"href=\"$link_attr{'-href'}\" ".
|
||||
"type=\"$link_attr{'-type'}\" ".
|
||||
"/>\n";
|
||||
}
|
||||
|
||||
} else {
|
||||
printf('<link rel="alternate" title="%s projects list" '.
|
||||
'href="%s" type="text/plain; charset=utf-8" />'."\n",
|
||||
esc_attr($site_name), href(project=>undef, action=>"project_index"));
|
||||
printf('<link rel="alternate" title="%s projects feeds" '.
|
||||
'href="%s" type="text/x-opml" />'."\n",
|
||||
esc_attr($site_name), href(project=>undef, action=>"opml"));
|
||||
}
|
||||
print_feed_meta()
|
||||
if ($status eq '200 OK');
|
||||
if (defined $favicon) {
|
||||
print qq(<link rel="shortcut icon" href=").esc_url($favicon).qq(" type="image/png" />\n);
|
||||
}
|
||||
|
||||
2
trace.c
2
trace.c
@ -25,7 +25,7 @@
|
||||
#include "cache.h"
|
||||
#include "quote.h"
|
||||
|
||||
void do_nothing(size_t unused)
|
||||
static void do_nothing(size_t unused)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@ -74,14 +74,14 @@ PATTERNS("python", "^[ \t]*((class|def)[ \t].*)$",
|
||||
"[a-zA-Z_][a-zA-Z0-9_]*"
|
||||
"|[-+0-9.e]+[jJlL]?|0[xX]?[0-9a-fA-F]+[lL]?"
|
||||
"|[-+*/<>%&^|=!]=|//=?|<<=?|>>=?|\\*\\*=?"
|
||||
"|[^[:space:]|[\x80-\xff]+"),
|
||||
"|[^[:space:]]|[\x80-\xff]+"),
|
||||
/* -- */
|
||||
PATTERNS("ruby", "^[ \t]*((class|module|def)[ \t].*)$",
|
||||
/* -- */
|
||||
"(@|@@|\\$)?[a-zA-Z_][a-zA-Z0-9_]*"
|
||||
"|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+|\\?(\\\\C-)?(\\\\M-)?."
|
||||
"|//=?|[-+*/<>%&^|=!]=|<<=?|>>=?|===|\\.{1,3}|::|[!=]~"
|
||||
"|[^[:space:]|[\x80-\xff]+"),
|
||||
"|[^[:space:]]|[\x80-\xff]+"),
|
||||
PATTERNS("bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
|
||||
"[={}\"]|[^={}\" \t]+"),
|
||||
PATTERNS("tex", "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
|
||||
|
||||
Reference in New Issue
Block a user