From: Junio C Hamano Date: Wed, 16 Apr 2008 09:10:05 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.5-63-ga17b1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=33f9843a29fba1c9069c53187072d5d33b124f1a;p=git.git Autogenerated HTML docs for v1.5.5-63-ga17b1 --- diff --git a/git-cvsserver.html b/git-cvsserver.html index 9084c8739..ccb9def4c 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html @@ -394,7 +394,9 @@ CVS_SERVER directly in CVSROOT like

This has the advantage that it will be saved in your CVS/Root files and you don't need to worry about always setting the correct environment -variable.

+variable. SSH users restricted to git-shell don't need to override the default +with CVS_SERVER (and shouldn't) as git-shell understands cvs to mean +git-cvsserver and pretends that the other end runs the real cvs better.

  • @@ -428,12 +430,12 @@ allowing access over SSH.

  • -On the client machine you need to set the following variables. - CVSROOT should be set as per normal, but the directory should point at the - appropriate git repo. For example: +If you didn't specify the CVSROOT/CVS_SERVER directly in the checkout command, + automatically saving it in your CVS/Root files, then you need to set them + explicitly in your environment. CVSROOT should be set as per normal, but the + directory should point at the appropriate git repo. As above, for SSH clients + _not_ restricted to git-shell, CVS_SERVER should be set to git-cvsserver.

    -

    For SSH access, CVS_SERVER should be set to git-cvsserver

    -

    Example:

         export CVSROOT=:ext:user@server:/var/git/project.git
@@ -442,14 +444,20 @@ On the client machine you need to set the following variables.

  • -For SSH clients that will make commits, make sure their .bashrc file - sets the GIT_AUTHOR and GIT_COMMITTER variables. +For SSH clients that will make commits, make sure their server-side + .ssh/environment files (or .bashrc, etc., according to their specific shell) + export appropriate values for GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, + GIT_COMMITTER_NAME, and GIT_COMMITTER_EMAIL. For SSH clients whose login + shell is bash, .bashrc may be a reasonable alternative.

  • Clients should now be able to check out the project. Use the CVS module - name to indicate what GIT head you want to check out. Example: + name to indicate what GIT head you want to check out. This also sets the + name of your newly checked-out directory, unless you tell it otherwise with + -d <dir_name>. For example, this checks out master branch to the + project-master directory:

    @@ -701,7 +709,7 @@ Martin Langhoff <martin@catalyst.net.nz>
    diff --git a/git-cvsserver.txt b/git-cvsserver.txt index 9cec8021b..b1106714b 100644 --- a/git-cvsserver.txt +++ b/git-cvsserver.txt @@ -110,7 +110,9 @@ cvs -d ":ext;CVS_SERVER=git-cvsserver:user@server/path/repo.git" co ------ This has the advantage that it will be saved in your 'CVS/Root' files and you don't need to worry about always setting the correct environment -variable. +variable. SSH users restricted to git-shell don't need to override the default +with CVS_SERVER (and shouldn't) as git-shell understands `cvs` to mean +git-cvsserver and pretends that the other end runs the real cvs better. -- 2. For each repo that you want accessible from CVS you need to edit config in the repo and add the following section. @@ -141,25 +143,29 @@ allowing access over SSH. enabled=1 ------ -- -3. On the client machine you need to set the following variables. - CVSROOT should be set as per normal, but the directory should point at the - appropriate git repo. For example: +3. If you didn't specify the CVSROOT/CVS_SERVER directly in the checkout command, + automatically saving it in your 'CVS/Root' files, then you need to set them + explicitly in your environment. CVSROOT should be set as per normal, but the + directory should point at the appropriate git repo. As above, for SSH clients + _not_ restricted to git-shell, CVS_SERVER should be set to git-cvsserver. + -- -For SSH access, CVS_SERVER should be set to git-cvsserver - -Example: - ------ export CVSROOT=:ext:user@server:/var/git/project.git export CVS_SERVER=git-cvsserver ------ -- -4. For SSH clients that will make commits, make sure their .bashrc file - sets the GIT_AUTHOR and GIT_COMMITTER variables. +4. For SSH clients that will make commits, make sure their server-side + .ssh/environment files (or .bashrc, etc., according to their specific shell) + export appropriate values for GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, + GIT_COMMITTER_NAME, and GIT_COMMITTER_EMAIL. For SSH clients whose login + shell is bash, .bashrc may be a reasonable alternative. 5. Clients should now be able to check out the project. Use the CVS 'module' - name to indicate what GIT 'head' you want to check out. Example: + name to indicate what GIT 'head' you want to check out. This also sets the + name of your newly checked-out directory, unless you tell it otherwise with + `-d `. For example, this checks out 'master' branch to the + `project-master` directory: + ------ cvs co -d project-master master