undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  gitweb: Check git base URLs before generating URL from it
  Documentation: add git in /etc/services.
  Documentation: add upload-archive service to git-daemon.
  git-cherry: document limit and add diagram
  diff-format.txt: Correct information about pathnames quoting in patch format
This commit is contained in:
Junio C Hamano 2006-10-27 02:16:18 -07:00
commit 019298015b
5 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/diff-format.txt
View File

@ -144,8 +144,10 @@ the file that rename/copy produces, respectively.
dissimilarity index <number> dissimilarity index <number>
index <hash>..<hash> <mode> index <hash>..<hash> <mode>
3. TAB, LF, and backslash characters in pathnames are 3. TAB, LF, double quote and backslash characters in pathnames
represented as `\t`, `\n`, and `\\`, respectively. are represented as `\t`, `\n`, `\"` and `\\`, respectively.
If there is need for such substitution then the whole
pathname is put in double quotes.
combined diff format combined diff format

7
Documentation/everyday.txt
View File

@ -353,6 +353,13 @@ example of managing a shared central repository.
Examples Examples
~~~~~~~~ ~~~~~~~~
We assume the following in /etc/services::
+
------------
$ grep 9418 /etc/services
git 9418/tcp # Git Version Control System
------------
Run git-daemon to serve /pub/scm from inetd.:: Run git-daemon to serve /pub/scm from inetd.::
+ +
------------ ------------

19
Documentation/git-cherry.txt
View File

@ -7,7 +7,7 @@ git-cherry - Find commits not merged upstream
SYNOPSIS SYNOPSIS
-------- --------
'git-cherry' [-v] <upstream> [<head>] 'git-cherry' [-v] <upstream> [<head>] [<limit>]
DESCRIPTION DESCRIPTION
----------- -----------
@ -18,7 +18,22 @@ Every commit that doesn't exist in the <upstream> branch
has its id (sha1) reported, prefixed by a symbol. The ones that have has its id (sha1) reported, prefixed by a symbol. The ones that have
equivalent change already equivalent change already
in the <upstream> branch are prefixed with a minus (-) sign, and those in the <upstream> branch are prefixed with a minus (-) sign, and those
that only exist in the <head> branch are prefixed with a plus (+) symbol. that only exist in the <head> branch are prefixed with a plus (+) symbol:
__*__*__*__*__> <upstream>
/
fork-point
\__+__+__-__+__+__-__+__> <head>
If a <limit> has been given then the commits along the <head> branch up
to and including <limit> are not reported:
__*__*__*__*__> <upstream>
/
fork-point
\__*__*__<limit>__-__+__> <head>
Because git-cherry compares the changeset rather than the commit id Because git-cherry compares the changeset rather than the commit id
(sha1), you can use git-cherry to find out if a commit you made locally (sha1), you can use git-cherry to find out if a commit you made locally

12
Documentation/git-daemon.txt
View File

@ -37,6 +37,8 @@ from `git-fetch`, `git-ls-remote`, and `git-clone`.
This is ideally suited for read-only updates, i.e., pulling from This is ideally suited for read-only updates, i.e., pulling from
git repositories. git repositories.
An `upload-archive` also exists to serve `git-archive`.
OPTIONS OPTIONS
------- -------
--strict-paths:: --strict-paths::
@ -155,8 +157,18 @@ upload-pack::
disable it by setting `daemon.uploadpack` configuration disable it by setting `daemon.uploadpack` configuration
item to `false`. item to `false`.
upload-archive::
This serves `git-archive --remote`.
EXAMPLES EXAMPLES
-------- --------
We assume the following in /etc/services::
+
------------
$ grep 9418 /etc/services
git 9418/tcp # Git Version Control System
------------
git-daemon as inetd server:: git-daemon as inetd server::
To set up `git-daemon` as an inetd service that handles any To set up `git-daemon` as an inetd service that handles any
repository under the whitelisted set of directories, /pub/foo repository under the whitelisted set of directories, /pub/foo

2
gitweb/gitweb.perl
View File

@ -80,7 +80,7 @@ our $strict_export = "++GITWEB_STRICT_EXPORT++";
# list of git base URLs used for URL to where fetch project from, # list of git base URLs used for URL to where fetch project from,
# i.e. full URL is "$git_base_url/$project" # i.e. full URL is "$git_base_url/$project"
our @git_base_url_list = ("++GITWEB_BASE_URL++"); our @git_base_url_list = grep { $_ ne '' } ("++GITWEB_BASE_URL++");
# default blob_plain mimetype and default charset for text/plain blob # default blob_plain mimetype and default charset for text/plain blob
our $default_blob_plain_mimetype = 'text/plain'; our $default_blob_plain_mimetype = 'text/plain';