mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
Merge branch 'maint'
* maint: post-receive-email: fix accidental removal of a trailing space in signature line Escape project names before creating pathinfo URLs Escape project name in regexp bash: Add completion for git diff --base --ours --theirs diff-options.txt: document the new "--dirstat" option
This commit is contained in:
commit
bdb87afb4b
|
@ -58,6 +58,14 @@ endif::git-format-patch[]
|
|||
number of modified files, as well as number of added and deleted
|
||||
lines.
|
||||
|
||||
--dirstat[=limit]::
|
||||
Output only the sub-directories that are impacted by a diff,
|
||||
and to what degree they are impacted. You can override the
|
||||
default cut-off in percent (3) by "--dirstat=limit". If you
|
||||
want to enable "cumulative" directory statistics, you can use
|
||||
the "--cumulative" flag, which adds up percentages recursively
|
||||
even when they have been already reported for a sub-directory.
|
||||
|
||||
--summary::
|
||||
Output a condensed summary of extended header information
|
||||
such as creations, renames and mode changes.
|
||||
|
|
|
@ -641,6 +641,7 @@ _git_diff ()
|
|||
--ignore-all-space --exit-code --quiet --ext-diff
|
||||
--no-ext-diff
|
||||
--no-prefix --src-prefix= --dst-prefix=
|
||||
--base --ours --theirs
|
||||
"
|
||||
return
|
||||
;;
|
||||
|
|
|
@ -202,11 +202,12 @@ generate_email_header()
|
|||
|
||||
generate_email_footer()
|
||||
{
|
||||
SPACE=" "
|
||||
cat <<-EOF
|
||||
|
||||
|
||||
hooks/post-receive
|
||||
--
|
||||
--${SPACE}
|
||||
$projectdesc
|
||||
EOF
|
||||
}
|
||||
|
|
|
@ -511,7 +511,7 @@ sub evaluate_path_info {
|
|||
}
|
||||
# do not change any parameters if an action is given using the query string
|
||||
return if $action;
|
||||
$path_info =~ s,^$project/*,,;
|
||||
$path_info =~ s,^\Q$project\E/*,,;
|
||||
my ($refname, $pathname) = split(/:/, $path_info, 2);
|
||||
if (defined $pathname) {
|
||||
# we got "project.git/branch:filename" or "project.git/branch:dir/"
|
||||
|
@ -633,7 +633,7 @@ (%)
|
|||
my ($use_pathinfo) = gitweb_check_feature('pathinfo');
|
||||
if ($use_pathinfo) {
|
||||
# use PATH_INFO for project name
|
||||
$href .= "/$params{'project'}" if defined $params{'project'};
|
||||
$href .= "/".esc_url($params{'project'}) if defined $params{'project'};
|
||||
delete $params{'project'};
|
||||
|
||||
# Summary just uses the project path URL
|
||||
|
@ -2575,7 +2575,7 @@ sub git_header_html {
|
|||
my $action = $my_uri;
|
||||
my ($use_pathinfo) = gitweb_check_feature('pathinfo');
|
||||
if ($use_pathinfo) {
|
||||
$action .= "/$project";
|
||||
$action .= "/".esc_url($project);
|
||||
} else {
|
||||
$cgi->param("p", $project);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue