From fb8e23fae2ac9af831260079b14eabad316f3769 Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Thu, 26 Oct 2006 22:21:02 +0200 Subject: [PATCH 1/5] diff-format.txt: Correct information about pathnames quoting in patch format Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano --- Documentation/diff-format.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index 174d63a1ee..2060ae2fcb 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt @@ -144,8 +144,10 @@ the file that rename/copy produces, respectively. dissimilarity index index .. -3. TAB, LF, and backslash characters in pathnames are - represented as `\t`, `\n`, and `\\`, respectively. +3. TAB, LF, double quote and backslash characters in pathnames + 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 From a8ebdb90f9e7017aa47c7824c91dfb0dd231ac85 Mon Sep 17 00:00:00 2001 From: Rene Scharfe Date: Thu, 26 Oct 2006 23:32:41 +0200 Subject: [PATCH 2/5] git-cherry: document limit and add diagram This patch adds the diagram from the long usage string of git-cherry to its documentation, and documents the third option. I changed some of the + to - in order to save the reader from wondering where they might fit into the picture. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- Documentation/git-cherry.txt | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index e1bf8ee255..27b67b81a5 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -7,7 +7,7 @@ git-cherry - Find commits not merged upstream SYNOPSIS -------- -'git-cherry' [-v] [] +'git-cherry' [-v] [] [] DESCRIPTION ----------- @@ -18,7 +18,22 @@ Every commit that doesn't exist in the branch has its id (sha1) reported, prefixed by a symbol. The ones that have equivalent change already in the branch are prefixed with a minus (-) sign, and those -that only exist in the branch are prefixed with a plus (+) symbol. +that only exist in the branch are prefixed with a plus (+) symbol: + + __*__*__*__*__> + / + fork-point + \__+__+__-__+__+__-__+__> + + +If a has been given then the commits along the branch up +to and including are not reported: + + __*__*__*__*__> + / + fork-point + \__*__*____-__+__> + 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 From e2b1d1ccdd2ef4db41819bb0d242b808cfe6c422 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 27 Oct 2006 06:59:18 +0200 Subject: [PATCH 3/5] Documentation: add upload-archive service to git-daemon. This patch minimaly documents the upload-archive service, hoping that someone with better knowledge will improve upon. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- Documentation/git-daemon.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index 4b2ea2df31..f10a269912 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -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 git repositories. +An `upload-archive` also exists to serve `git-archive`. + OPTIONS ------- --strict-paths:: @@ -155,6 +157,9 @@ upload-pack:: disable it by setting `daemon.uploadpack` configuration item to `false`. +upload-archive:: + This serves `git-archive --remote`. + EXAMPLES -------- git-daemon as inetd server:: From f8a5da6d94baa0a90e7b383932911661bb551e1c Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 27 Oct 2006 07:00:57 +0200 Subject: [PATCH 4/5] Documentation: add git in /etc/services. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- Documentation/everyday.txt | 7 +++++++ Documentation/git-daemon.txt | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt index 278161f587..9677671892 100644 --- a/Documentation/everyday.txt +++ b/Documentation/everyday.txt @@ -353,6 +353,13 @@ example of managing a shared central repository. 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.:: + ------------ diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index f10a269912..993adc7c5a 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -162,6 +162,13 @@ upload-archive:: EXAMPLES -------- +We assume the following in /etc/services:: ++ +------------ +$ grep 9418 /etc/services +git 9418/tcp # Git Version Control System +------------ + git-daemon as inetd server:: To set up `git-daemon` as an inetd service that handles any repository under the whitelisted set of directories, /pub/foo From d6b7e0b98f8d0f84e3b2614b33b52402fefb5735 Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Thu, 26 Oct 2006 12:26:44 +0200 Subject: [PATCH 5/5] gitweb: Check git base URLs before generating URL from it Check if each of git base URLs in @git_base_url_list is true before appending "/$project" to it to generate project URL. This fixes the error that for default configuration for gitweb in Makefile, with GITWEB_BASE_URL empty (and "++GITWEB_BASE_URL++" being "" in gitweb.cgi), we had URL of "/$project" in the summary view. Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano --- gitweb/gitweb.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 2390603e97..05e7b1253b 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -69,7 +69,7 @@ our $strict_export = "++GITWEB_STRICT_EXPORT++"; # list of git base URLs used for URL to where fetch project from, # 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 our $default_blob_plain_mimetype = 'text/plain';