[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Savannah-cvs] [608] review wordings
From: |
ineiev |
Subject: |
[Savannah-cvs] [608] review wordings |
Date: |
Thu, 4 May 2023 07:07:42 -0400 (EDT) |
Revision: 608
http://svn.savannah.gnu.org/viewvc/?view=rev&root=administration&revision=608
Author: ineiev
Date: 2023-05-04 07:07:41 -0400 (Thu, 04 May 2023)
Log Message:
-----------
review wordings
Modified Paths:
--------------
trunk/sviki/UsingGit.mdwn
Modified: trunk/sviki/UsingGit.mdwn
===================================================================
--- trunk/sviki/UsingGit.mdwn 2023-05-01 02:02:17 UTC (rev 607)
+++ trunk/sviki/UsingGit.mdwn 2023-05-04 11:07:41 UTC (rev 608)
@@ -3,16 +3,16 @@
URL list summary:
-* `git://git.savannah.gnu.org/myproject.git` - unencrypted read-only git
+* `git://git.savannah.gnu.org/mygroup.git` - unencrypted read-only git
lightweight protocol
-* **`ssh://git.savannah.gnu.org/srv/git/myproject.git`** - encrypted
+* **`ssh://git.savannah.gnu.org/srv/git/mygroup.git`** - encrypted
member read-write developer access using SSH
-* **`https://git.savannah.gnu.org/git/myproject.git`** - encrypted
+* **`https://git.savannah.gnu.org/git/mygroup.git`** - encrypted
read-only anonymous smart http access
-* `http://git.savannah.gnu.org/git/myproject.git` - unencrypted
+* `http://git.savannah.gnu.org/git/mygroup.git` - unencrypted
read-only anonymous smart http access, for use behind restrictive
firewalls
-* `http://git.savannah.gnu.org/r/myproject.git` - unencrypted
+* `http://git.savannah.gnu.org/r/mygroup.git` - unencrypted
read-only anonymous smart http access, for use behind excessively
restrictive firewalls
previously this was the slow dumb protocol but has since been
@@ -37,9 +37,9 @@
If you use ssh-based access, please verify the host keys first at
[[SshAccess]]
-Note: There is up to a 1/2 hour delay between Git project creation in
+Note: There is up to a 1/2 hour delay between Git group creation in
the web front-end, and its creation on the back-end system. The
-back-end version control system hosting git creates projects by
+back-end version control system hosting git creates repositories by
running a cron job every half hour.
Basic commands
@@ -47,13 +47,13 @@
- Checkout (read-only):
- git clone https://git.savannah.gnu.org/git/project.git
+ git clone https://git.savannah.gnu.org/git/group.git
or
- git clone git://git.savannah.gnu.org/project.git
+ git clone git://git.savannah.gnu.org/group.git
- For example cloning the GNU Hello project.
+ For example cloning the GNU Hello package.
git clone https://git.savannah.gnu.org/git/hello
@@ -70,21 +70,21 @@
blocked. Avoid if possible, and please tell your local sysadmin
to allow https and/or git protocol on port 9418:
- git clone http://git.savannah.gnu.org/r/project.git
+ git clone http://git.savannah.gnu.org/r/group.git
-- Project member checkout: If you want to be able to push your changes
+- Group member checkout: If you want to be able to push your changes
back into the repository on Savannah then members must use ssh
protocol to have write access.
- git clone ssh://login@git.sv.gnu.org/srv/git/project.git
+ git clone ssh://login@git.sv.gnu.org/srv/git/group.git
Or using the alternative scp-like format. Both are equivalent.
- git clone login@git.sv.gnu.org:/srv/git/project.git
+ git clone login@git.sv.gnu.org:/srv/git/group.git
Note that the ssh transport requires an active Savannah account and
-you must be a member of at least one project group in order for your
-account to be enabled.
+you must be a member of at least one group in order for your account
+to be enabled.
Developer setup
---------------
@@ -118,8 +118,8 @@
- Create the initial directory and change to it:
- mkdir project_directory
- cd project_directory
+ mkdir git_directory
+ cd git_directory
- Initial push / import:
@@ -131,7 +131,7 @@
git commit -m "Initial import"
# initial publication to the 'master' branch
- git push --all login@git.sv.gnu.org:/srv/git/project.git
+ git push --all login@git.sv.gnu.org:/srv/git/group.git
Note: at this point your repository is not setup to merge \_from\_
the remote branch when you type 'git pull'. You can either freshly
@@ -138,19 +138,19 @@
'clone' the repository (see "Developer checkout" below), or
configure your current repository this way:
- git remote add -f origin login@git.sv.gnu.org:/srv/git/project.git
+ git remote add -f origin login@git.sv.gnu.org:/srv/git/group.git
git config branch.master.remote origin
git config branch.master.merge refs/heads/master
- Developer checkout (via SSH - beware of punctuation):
- git clone ssh://login@git.sv.gnu.org/srv/git/project.git
+ git clone ssh://login@git.sv.gnu.org/srv/git/group.git
# or
- git clone login@git.sv.gnu.org:/srv/git/project.git
+ git clone login@git.sv.gnu.org:/srv/git/group.git
- Commit:
- cd project/
+ cd group/
# <edit some_existing_file>
git commit -a -m "I automatically commit modified files"
@@ -172,13 +172,13 @@
public anonymous read-only git:// url this can be changed to the
authenticated ssh:// url using git remote set-url:
- git remote set-url origin ssh://login@git.sv.gnu.org/srv/git/project.git
+ git remote set-url origin ssh://login@git.sv.gnu.org/srv/git/group.git
If the origin remote has been removed, or if someone wishes to remove
origin and recreate it, then it may be removed and set:
git remote rm origin
- git remote add origin ssh://login@git.sv.gnu.org/srv/git/project.git
+ git remote add origin ssh://login@git.sv.gnu.org/srv/git/group.git
git fetch
git branch -u origin/master master
@@ -234,10 +234,10 @@
------------------
Git comes with the tool, `git-cvsimport` which will import a CVS
-repository into a new git project. You may want to use this for
+repository into a new git repository. You may want to use this for
converting your existing CVS repository to a new git repository.
-We will use a file which maps a savannah login name username to real
+We will use a file which maps a Savannah login name username to real
name (option `-A`) in the `git-cvsimport` command. The format of this
file like this:
@@ -249,16 +249,16 @@
mythical shell session:
$ # create authors.txt
- $ project='myproject' # change myproject
+ $ group='mygroup' # change mygroup
$ myrepository='pserver:anonymous@cvs.savannah.nongnu.org' # Or whatever
you usually use for CVS
- $ mkdir $project
- $ cd $project # Note: that this is new directory. It is not git yet.
+ $ mkdir $group
+ $ cd $group # Note: that this is new directory. It is not git yet.
$ module='mymodule' # adjust this
- $ git-cvsimport -A ../authors.txt -p x -v
-d:${myrepository}:/sources/$project $module
+ $ git-cvsimport -A ../authors.txt -p x -v
-d:${myrepository}:/sources/$group $module
Adjust the variables `myrepostory` to be whatever you use to checkout
CVS; the `cvs.savannah.nongnu.org` address won't be correct if your
-project is a GNU project. If your project is old or has lots of commits,
+group is a GNU package. If your group is old or has lots of commits,
`git-cvsimport` may take a long time because it is replaying the entire
commit history: copying down each version of each file and then
performing essentially `git-commit` for every CVS commit.
@@ -272,8 +272,8 @@
similar to SVK, more useful for maintaining a local branch than for
importing a repository (IMHO). We'll use `git-svnimport`.
-We will use a file which maps a savannah login name username to real
-name (option `-A`). It looks like this:
+We will use a file which maps a Savannah login name to real name
+(option `-A`). It looks like this:
rms = Richard M. Stallman <rms@gnu.org>
toto = Another User <me@mydomain.com>
@@ -296,13 +296,13 @@
want. For this reason it's preferable to rsync the SVN repository
locally:
- rsync -av rsync://svn.sv.gnu.org/svn/myproject svn_repo
+ rsync -av rsync://svn.sv.gnu.org/svn/mygroup svn_repo
or create it from a dump:
- wget http://svn.gna.org/daily/myproject.dump.gz
+ wget http://svn.gna.org/daily/mygroup.dump.gz
svnadmin create svn_repo
- zcat myproject.dump.gz | svnadmin load svn_repo/
+ zcat mygroup.dump.gz | svnadmin load svn_repo/
To access a local copy of the repository, use svnserve:
@@ -310,9 +310,9 @@
Then access it with git svn with something like:
- git svn clone svn://127.0.0.1/myproject -A authors-transform.txt
--stdlayout ./temp.checkout
+ git svn clone svn://127.0.0.1/mygroup -A authors-transform.txt --stdlayout
./temp.checkout
-where myproject is the subdirectory under svn_repo.
+where mygroup is the subdirectory under svn_repo.
Importing from GNU Arch
-----------------------
@@ -319,11 +319,11 @@
Use `git-archimport`.
-Example importing a project with a `project--main--1.0` main archive and
-a `project--release--1.7` tag, converting the Arch-style names into
+Example importing a repository with a `group--main--1.0` main archive and
+a `group--release--1.7` tag, converting the Arch-style names into
Git-style names:
- git-archimport me@domain.tld--2007/project--main--1.0:master
project--release--1.7:v1.7
+ git-archimport me@domain.tld--2007/group--main--1.0:master
group--release--1.7:v1.7
Importing from CVS
------------------
@@ -334,8 +334,8 @@
$ cd my-checked-out-cvs-repository
$ cvs tag cvs-repository-moved-to-git
-On your project page, activate git. For example the libcdio project the
-URL for the project page is:
+On your group page, activate git. For example the libcdio group the
+URL for the group page is:
https://savannah.gnu.org/project/admin/editgroupfeatures.php?group=libcdio
@@ -359,11 +359,11 @@
--
*+ [master] Moved from CVS to GIT.
-Before pushing this to your savannah project page you might want to
+Before pushing this to your Savannah group page you might want to
rename or remove that "origin" branch. It has the same state and history
as the master branch so you won't lose any information. (Footnote:
Normally the origin branch is used by developers who prefer to use git
-while working on projects that only run a central CVS repository. They
+while working on groups that only run a central CVS repository. They
do their work on "master" but track the changes in the CVS repository in
the "origin" branch.) This is not what you are going to do anyway and
unfortunately "origin" is also the default alias name for remote git
@@ -376,7 +376,7 @@
so by branching off at that last CVS commit and call the branch
"origin", "cvs" or "back-in-the-dark-ages".
-Now you are ready to push this git repository to your savannah project
+Now you are ready to push this git repository to your Savannah group
page using the instructions under [Pushing a Newly-Created, Existing, or
Converted Git
Repository](http://savannah.gnu.org/maintenance/UsingGit#pushing-a-newly-created-existing-or-converted-git-repository).
@@ -394,13 +394,13 @@
the --tags option to send them with the initial import:
$ login='mylogin'
- $ project='myproject'
- $ git push --tags -v ${login}@git.sv.gnu.org:/srv/git/${project}.git
+ $ group='mygroup'
+ $ git push --tags -v ${login}@git.sv.gnu.org:/srv/git/${group}.git
Similarly remember to use the '--all' flags to push all branches, not
just the 'master' one:
- $ git push --all -v ${login}@git.sv.gnu.org:/srv/git/${project}.git
+ $ git push --all -v ${login}@git.sv.gnu.org:/srv/git/${group}.git
If you have branches and you don't push all branches when you do a
`git-clone` you may get error messages like the one below:
@@ -419,7 +419,7 @@
-----------------
We don't really like this, but there's a way to remove remote branches.
-We don't like it because this allow project members to potentially
+We don't like it because this allow group members to potentially
remove free software from Savannah, willingly or by mistake. This is
mitigated by the fact it is very easy to push back changes.
@@ -449,11 +449,11 @@
users who already cloned a public repository - as a simple 'pull' will fail
in their local repository.
-Under special circumstances, savannah administrators can temporarily enable
+Under special circumstances, Savannah administrators can temporarily enable
non-fast-forward commits in a specific repository. Such cases include:
-* Newly created project, where there is no existing code, and it is clear
- the new project administrator accidentally commited wrong code (e.g.
+* Newly created group, where there is no existing code, and it is clear
+ the new group administrator accidentally commited wrong code (e.g.
<http://savannah.gnu.org/support/?108709>).
* Accidental commits when it is clear no code will be lost due to enabling
non-fast-forwards commits (e.g.
@@ -493,21 +493,21 @@
FAQ
----
-* How does a project admin update the "description" file for the web
+* How does a group admin update the "description" file for the web
interface?
- Unfortunately nothing has been implemented to allow the project
+ Unfortunately nothing has been implemented to allow the group
administrator to do this from the web interface. Fortunately this
doesn't need to change very often. Please submit a
[support
request](https://savannah.gnu.org/support/?func=additem&group=administration)
and a Savannah Admin will happily make the changes for you.
-* Similarly, how can a project admin update the "HEAD" file to point
+* Similarly, how can a group admin update the "HEAD" file to point
to another branch?
Unusual branching strategies are strongly discouraged. "Standard is
better than better." You are encouraged to use typical branching
- strategies. If you need something custom for your project please
+ strategies. If you need something custom for your group please
file a
[support
request](https://savannah.gnu.org/support/?func=additem&group=administration)
and a Savannah Admin will discuss this with you and take any actions
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Savannah-cvs] [608] review wordings,
ineiev <=