* [PATCH] Cogito README: add a block describing team workflow with git+ssh
@ 2005-09-29 6:31 Martin Langhoff
2005-09-29 21:25 ` Elfyn McBratney
0 siblings, 1 reply; 6+ messages in thread
From: Martin Langhoff @ 2005-09-29 6:31 UTC (permalink / raw)
To: git; +Cc: Martin Langhoff
The README doesn't talk about teams with "peer" access to a shared repo.
It took me a while to figure our the /right/ way to do it. Document for
future generations and general happiness.
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
---
README | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
ffd2191e527f6b7c67fa7939927a0bd30270c11a
diff --git a/README b/README
--- a/README
+++ b/README
@@ -268,6 +268,41 @@ Note that we gave only a glimpse to the
- merging (`cg-merge`), moving your tree to an older commit (`cg-seek`),
pushing (`cg-push`), etc.
+Using Cogito for Team Work
+--------------------------
+
+A small team with SSH access to a shared server can use Cogito in a way
+similar to traditional CVS over SSH.
+
+If you are bootstrapping the project, and you have a local Cogito working copy,
+you must set up the shared repository and push a local head to it.
+
+To set up the shared repository, for example in
+remoteserver:/var/git, login to the remote server and do
+
+ $ umask 002
+ $ mkdir /var/git
+ $ chgroup gitcommit /var/git
+ $ chmod 2775 /var/git
+ $ mkdir -p /var/git/projectname.git
+ $ GIT_DIR=/var/git/projectname.git git-init-db
+
+Note: All the developers with "commit" access must belong to the gitcommit
+group and have a 002 umask on the remote server.
+
+Going back to your Cogito working copy, run
+
+ $ git-push remoteserver:/var/git/projectname.git master branchname
+
+Now your other teammembers can start working with you, doing
+
+ $ cg-clone git+ssh://remoteserver/var/git/project.git#branchname localdir
+
+And when they are ready to push their work onto the shared repository, just do
+
+ $ cg-update
+ $ cg-push
+
Understanding GIT branching and merging
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Cogito README: add a block describing team workflow with git+ssh
2005-09-29 6:31 Martin Langhoff
@ 2005-09-29 21:25 ` Elfyn McBratney
2005-09-29 21:52 ` Martin Langhoff
0 siblings, 1 reply; 6+ messages in thread
From: Elfyn McBratney @ 2005-09-29 21:25 UTC (permalink / raw)
To: git; +Cc: Martin Langhoff
[-- Attachment #1: Type: text/plain, Size: 1418 bytes --]
On Thu, Sep 29, 2005 at 06:31:17 +1200, Martin Langhoff wrote:
> The README doesn't talk about teams with "peer" access to a shared repo.
> It took me a while to figure our the /right/ way to do it. Document for
> future generations and general happiness.
>
> Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
> [...]
>
> + $ chgroup gitcommit /var/git
s/chgroup/chgrp/
> + $ chmod 2775 /var/git
> + $ mkdir -p /var/git/projectname.git
> + $ GIT_DIR=/var/git/projectname.git git-init-db
Hmm .. if you're you're going to be using cogito anyway, might it be an
idea to instead do:
$ GIT_DIR=/var/git/projectname.git/.git cg-init [-I]
?
> +Note: All the developers with "commit" access must belong to the gitcommit
> +group and have a 002 umask on the remote server.
> +
> +Going back to your Cogito working copy, run
> +
> + $ git-push remoteserver:/var/git/projectname.git master branchname
Ditto here, tho' that'll require that remotes have been set-up, of
course. ;)
Anyhow, nice howto - thanks. :)
Best,
Elfyn
--
Elfyn McBratney
Gentoo Developer/Perl Team Lead
beu/irc.freenode.net http://dev.gentoo.org/~beu/
+------------O.o--------------------- http://dev.gentoo.org/~beu/pubkey.asc
PGP Key ID: 0x69DF17AD
PGP Key Fingerprint:
DBD3 B756 ED58 B1B4 47B9 B3BD 8D41 E597 69DF 17AD
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Cogito README: add a block describing team workflow with git+ssh
2005-09-29 21:25 ` Elfyn McBratney
@ 2005-09-29 21:52 ` Martin Langhoff
2005-09-29 22:19 ` Elfyn McBratney
0 siblings, 1 reply; 6+ messages in thread
From: Martin Langhoff @ 2005-09-29 21:52 UTC (permalink / raw)
To: Elfyn McBratney, git, Martin Langhoff
On 9/30/05, Elfyn McBratney <beu@gentoo.org> wrote:
> > + $ chgroup gitcommit /var/git
>
> s/chgroup/chgrp/
Ooops! Thanks for catching that
> > + $ chmod 2775 /var/git
> > + $ mkdir -p /var/git/projectname.git
> > + $ GIT_DIR=/var/git/projectname.git git-init-db
>
> Hmm .. if you're you're going to be using cogito anyway, might it be an
> idea to instead do:
>
> $ GIT_DIR=/var/git/projectname.git/.git cg-init [-I]
You only really need git on the repo server, and I think that's a plus.
> > + $ git-push remoteserver:/var/git/projectname.git master branchname
>
> Ditto here, tho' that'll require that remotes have been set-up, of
> course. ;)
Yes, the cogito way of doing this seems messy. Is there a simple way
to set up the remote branch and push to it?
cheers,
martin
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Cogito README: add a block describing team workflow with git+ssh
2005-09-29 21:52 ` Martin Langhoff
@ 2005-09-29 22:19 ` Elfyn McBratney
0 siblings, 0 replies; 6+ messages in thread
From: Elfyn McBratney @ 2005-09-29 22:19 UTC (permalink / raw)
To: Martin Langhoff; +Cc: git
[-- Attachment #1: Type: text/plain, Size: 1386 bytes --]
On Fri, Sep 30, 2005 at 09:52:11AM +1200, Martin Langhoff wrote:
> On 9/30/05, Elfyn McBratney <beu@gentoo.org> wrote:
> > > + $ chgroup gitcommit /var/git
> >
> > s/chgroup/chgrp/
>
> Ooops! Thanks for catching that
Np :)
> > > + $ chmod 2775 /var/git
> > > + $ mkdir -p /var/git/projectname.git
> > > + $ GIT_DIR=/var/git/projectname.git git-init-db
> >
> > Hmm .. if you're you're going to be using cogito anyway, might it be an
> > idea to instead do:
> >
> > $ GIT_DIR=/var/git/projectname.git/.git cg-init [-I]
>
> You only really need git on the repo server, and I think that's a plus.
*nods*
> > > + $ git-push remoteserver:/var/git/projectname.git master branchname
> >
> > Ditto here, tho' that'll require that remotes have been set-up, of
> > course. ;)
>
> Yes, the cogito way of doing this seems messy. Is there a simple way
> to set up the remote branch and push to it?
Not that I know of, tho' I'm still quite new to cogito, mind. ;)
Best,
Elfyn
--
Elfyn McBratney
Gentoo Developer/Perl Team Lead
beu/irc.freenode.net http://dev.gentoo.org/~beu/
+------------O.o--------------------- http://dev.gentoo.org/~beu/pubkey.asc
PGP Key ID: 0x69DF17AD
PGP Key Fingerprint:
DBD3 B756 ED58 B1B4 47B9 B3BD 8D41 E597 69DF 17AD
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] Cogito README: add a block describing team workflow with git+ssh
@ 2005-10-21 5:34 Martin Langhoff
2005-10-21 15:14 ` Petr Baudis
0 siblings, 1 reply; 6+ messages in thread
From: Martin Langhoff @ 2005-10-21 5:34 UTC (permalink / raw)
To: git; +Cc: Martin Langhoff
This is a resend, with a silly typo (chgroup/chgrp) fixed.
---
The README doesn't talk about teams with "peer" access to a shared repo.
It took me a while to figure our the /right/ way to do it. Document for
future generations and general happiness.
---
README | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
applies-to: 06a96ef8bc54639d5e42319c86cac2d812327cf0
1217193450bf9ae108af2341f1383eb496d31b62
diff --git a/README b/README
index 70908bc..fb87adb 100644
--- a/README
+++ b/README
@@ -268,6 +268,41 @@ Note that we gave only a glimpse to the
- merging (`cg-merge`), moving your tree to an older commit (`cg-seek`),
pushing (`cg-push`), etc.
+Using Cogito for Team Work
+--------------------------
+
+A small team with SSH access to a shared server can use Cogito in a way
+similar to traditional CVS over SSH.
+
+If you are bootstrapping the project, and you have a local Cogito working copy,
+you must set up the shared repository and push a local head to it.
+
+To set up the shared repository, for example in
+remoteserver:/var/git, login to the remote server and do
+
+ $ umask 002
+ $ mkdir /var/git
+ $ chgrp gitcommit /var/git
+ $ chmod 2775 /var/git
+ $ mkdir -p /var/git/projectname.git
+ $ GIT_DIR=/var/git/projectname.git git-init-db
+
+Note: All the developers with "commit" access must belong to the gitcommit
+group and have a 002 umask on the remote server.
+
+Going back to your Cogito working copy, run
+
+ $ git-push remoteserver:/var/git/projectname.git master branchname
+
+Now your other teammembers can start working with you, doing
+
+ $ cg-clone git+ssh://remoteserver/var/git/project.git#branchname localdir
+
+And when they are ready to push their work onto the shared repository, just do
+
+ $ cg-update
+ $ cg-push
+
Understanding GIT branching and merging
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
---
0.99.8.GIT
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Cogito README: add a block describing team workflow with git+ssh
2005-10-21 5:34 [PATCH] Cogito README: add a block describing team workflow with git+ssh Martin Langhoff
@ 2005-10-21 15:14 ` Petr Baudis
0 siblings, 0 replies; 6+ messages in thread
From: Petr Baudis @ 2005-10-21 15:14 UTC (permalink / raw)
To: Martin Langhoff; +Cc: git
Dear diary, on Fri, Oct 21, 2005 at 07:34:48AM CEST, I got a letter
where Martin Langhoff <martin@catalyst.net.nz> told me that...
> This is a resend, with a silly typo (chgroup/chgrp) fixed.
It was missing the signoff, but I worked that around by taking your
original patch from the end of September. ;-)
> The README doesn't talk about teams with "peer" access to a shared repo.
> It took me a while to figure our the /right/ way to do it. Document for
> future generations and general happiness.
Thanks. The long sequence of permissions setup inspired me to adding
cg-admin-setuprepo which automates that. I also changed the git-push
to cg-push. Please review the final result.
Thanks,
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2005-10-21 15:14 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-10-21 5:34 [PATCH] Cogito README: add a block describing team workflow with git+ssh Martin Langhoff
2005-10-21 15:14 ` Petr Baudis
-- strict thread matches above, loose matches on Subject: below --
2005-09-29 6:31 Martin Langhoff
2005-09-29 21:25 ` Elfyn McBratney
2005-09-29 21:52 ` Martin Langhoff
2005-09-29 22:19 ` Elfyn McBratney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).