threads / patch / 1974

patchCogito README: add a block describing team workflow with git+ssh

Subject: [PATCH] Cogito README: add a block describing team workflow with git+ssh

## tl;dr

4 messages between Sep 29, 2005 and Sep 29, 2005. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Martin Langhoff· Sep 29, 2005, 06:31 UTC · lore

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
Show changes to README +35 −0
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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Elfyn McBratney· Sep 29, 2005, 21:25 UTC · re: Martin Langhoff · lore

Re: [PATCH] Cogito README: add a block describing team workflow with git+ssh

On Thu, Sep 29, 2005 at 06:31:17 +1200, Martin Langhoff wrote:
Show 8 quoted lines
> 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]
?
Show 6 quoted lines
> +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
Martin Langhoff· Sep 29, 2005, 21:52 UTC · re: Elfyn McBratney · lore

Re: [PATCH] Cogito README: add a block describing team workflow with git+ssh

On 9/30/05, Elfyn McBratney <beu@gentoo.org> wrote:
> > +        $ chgroup gitcommit /var/git
>
> s/chgroup/chgrp/
Ooops! Thanks for catching that
Show 8 quoted lines
> > +        $ 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
Elfyn McBratney· Sep 29, 2005, 22:19 UTC · re: Martin Langhoff · lore

Re: [PATCH] Cogito README: add a block describing team workflow with git+ssh

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

← back to recent threads