mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* 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:
Junio C Hamano
2008-04-22 00:10:20 -07:00
parent 799596a5d0 71bd81ade2
commit bdb87afb4b
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/diff-options.txt
View File

@ -58,6 +58,14 @@ endif::git-format-patch[]
number of modified files, as well as number of added and deleted number of modified files, as well as number of added and deleted
lines. 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:: --summary::
Output a condensed summary of extended header information Output a condensed summary of extended header information
such as creations, renames and mode changes. such as creations, renames and mode changes.

1
contrib/completion/git-completion.bash
View File

@ -641,6 +641,7 @@ _git_diff ()
--ignore-all-space --exit-code --quiet --ext-diff --ignore-all-space --exit-code --quiet --ext-diff
--no-ext-diff --no-ext-diff
--no-prefix --src-prefix= --dst-prefix= --no-prefix --src-prefix= --dst-prefix=
--base --ours --theirs
" "
return return
;; ;;

3
contrib/hooks/post-receive-email
View File

@ -202,11 +202,12 @@ generate_email_header()
generate_email_footer() generate_email_footer()
{ {
SPACE=" "
cat <<-EOF cat <<-EOF
hooks/post-receive hooks/post-receive
-- --${SPACE}
$projectdesc $projectdesc
EOF EOF
} }

6
gitweb/gitweb.perl
View File

@ -511,7 +511,7 @@ sub evaluate_path_info {
} }
# do not change any parameters if an action is given using the query string # do not change any parameters if an action is given using the query string
return if $action; return if $action;
$path_info =~ s,^$project/*,,; $path_info =~ s,^\Q$project\E/*,,;
my ($refname, $pathname) = split(/:/, $path_info, 2); my ($refname, $pathname) = split(/:/, $path_info, 2);
if (defined $pathname) { if (defined $pathname) {
# we got "project.git/branch:filename" or "project.git/branch:dir/" # we got "project.git/branch:filename" or "project.git/branch:dir/"
@ -633,7 +633,7 @@ sub href(%) {
my ($use_pathinfo) = gitweb_check_feature('pathinfo'); my ($use_pathinfo) = gitweb_check_feature('pathinfo');
if ($use_pathinfo) { if ($use_pathinfo) {
# use PATH_INFO for project name # 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'}; delete $params{'project'};
# Summary just uses the project path URL # Summary just uses the project path URL
@ -2575,7 +2575,7 @@ EOF
my $action = $my_uri; my $action = $my_uri;
my ($use_pathinfo) = gitweb_check_feature('pathinfo'); my ($use_pathinfo) = gitweb_check_feature('pathinfo');
if ($use_pathinfo) { if ($use_pathinfo) {
$action .= "/$project"; $action .= "/".esc_url($project);
} else { } else {
$cgi->param("p", $project); $cgi->param("p", $project);
} }