{"thread":{"id":"1974","subject":"[PATCH] Cogito README: add a block describing team workflow with git+ssh","startedAt":"2005-09-29T06:31:17Z","lastAt":"2005-09-29T22:19:26Z","messageCount":4,"participants":["Martin Langhoff","Elfyn McBratney"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"9461","messageId":"11279754774179-git-send-email-martin@catalyst.net.nz","threadId":"1974","inReplyTo":null,"subject":"[PATCH] Cogito README: add a block describing team workflow with git+ssh","fromName":"Martin Langhoff","fromEmail":"martin@catalyst.net.nz","sentAt":"2005-09-29T06:31:17Z","receivedAt":"2005-09-29T06:31:17Z","isPatch":true,"sender":{"key":"martin@laptop.org","avatar":null},"body":"The README doesn't talk about teams with \"peer\" access to a shared repo.\nIt took me a while to figure our the /right/ way to do it. Document for\nfuture generations and general happiness.\n\nSigned-off-by: Martin Langhoff <martin@catalyst.net.nz>\n\n\n---\n\n README |   35 +++++++++++++++++++++++++++++++++++\n 1 files changed, 35 insertions(+), 0 deletions(-)\n\nffd2191e527f6b7c67fa7939927a0bd30270c11a\ndiff --git a/README b/README\n--- a/README\n+++ b/README\n@@ -268,6 +268,41 @@ Note that we gave only a glimpse to the \n - merging (`cg-merge`), moving your tree to an older commit (`cg-seek`),\n pushing (`cg-push`), etc.\n \n+Using Cogito for Team Work\n+--------------------------\n+\n+A small team with SSH access to a shared server can use Cogito in a way \n+similar to traditional CVS over SSH. \n+\n+If you are bootstrapping the project, and you have a local Cogito working copy,\n+you must set up the shared repository and push a local head to it.\n+\n+To set up the shared repository, for example in \n+remoteserver:/var/git, login to the remote server and do\n+\n+        $ umask  002\n+        $ mkdir /var/git\n+        $ chgroup gitcommit /var/git\n+        $ chmod  2775 /var/git\n+        $ mkdir -p /var/git/projectname.git\n+        $ GIT_DIR=/var/git/projectname.git git-init-db\n+        \n+Note: All the developers with \"commit\" access must belong to the gitcommit\n+group and have a 002 umask on the remote server.\n+\n+Going back to your Cogito working copy, run \n+\n+        $ git-push  remoteserver:/var/git/projectname.git master branchname\n+\n+Now your other teammembers can start working with you, doing\n+\n+         $ cg-clone git+ssh://remoteserver/var/git/project.git#branchname localdir\n+\n+And when they are ready to push their work onto the shared repository, just do\n+\n+         $ cg-update\n+         $ cg-push\n+\n \n Understanding GIT branching and merging\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"},{"id":"9505","messageId":"20050929212511.GA28106@zippy.emcb.local","threadId":"1974","inReplyTo":"11279754774179-git-send-email-martin@catalyst.net.nz","subject":"Re: [PATCH] Cogito README: add a block describing team workflow with git+ssh","fromName":"Elfyn McBratney","fromEmail":"beu@gentoo.org","sentAt":"2005-09-29T21:25:11Z","receivedAt":"2005-09-29T21:25:11Z","isPatch":true,"sender":{"key":"beu@gentoo.org","avatar":null},"body":"On Thu, Sep 29, 2005 at 06:31:17 +1200, Martin Langhoff wrote:\n> The README doesn't talk about teams with \"peer\" access to a shared repo.\n> It took me a while to figure our the /right/ way to do it. Document for\n> future generations and general happiness.\n> \n> Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>\n> [...]\n> \n> +        $ chgroup gitcommit /var/git\n\ns/chgroup/chgrp/\n\n> +        $ chmod  2775 /var/git\n> +        $ mkdir -p /var/git/projectname.git\n> +        $ GIT_DIR=/var/git/projectname.git git-init-db\n\nHmm .. if you're you're going to be using cogito anyway, might it be an\nidea to instead do:\n\n\t$ GIT_DIR=/var/git/projectname.git/.git cg-init [-I]\n\n?\n\n> +Note: All the developers with \"commit\" access must belong to the gitcommit\n> +group and have a 002 umask on the remote server.\n> +\n> +Going back to your Cogito working copy, run \n> +\n> +        $ git-push  remoteserver:/var/git/projectname.git master branchname\n\nDitto here, tho' that'll require that remotes have been set-up, of\ncourse. ;)\n\nAnyhow, nice howto - thanks. :)\n\nBest,\nElfyn\n\n-- \nElfyn McBratney\nGentoo Developer/Perl Team Lead\nbeu/irc.freenode.net                            http://dev.gentoo.org/~beu/\n+------------O.o--------------------- http://dev.gentoo.org/~beu/pubkey.asc\n\nPGP Key ID: 0x69DF17AD\nPGP Key Fingerprint:\n  DBD3 B756 ED58 B1B4 47B9  B3BD 8D41 E597 69DF 17AD\n"},{"id":"9511","messageId":"46a038f905092914524d3cd8c1@mail.gmail.com","threadId":"1974","inReplyTo":"20050929212511.GA28106@zippy.emcb.local","subject":"Re: [PATCH] Cogito README: add a block describing team workflow with git+ssh","fromName":"Martin Langhoff","fromEmail":"martin.langhoff@gmail.com","sentAt":"2005-09-29T21:52:11Z","receivedAt":"2005-09-29T21:52:11Z","isPatch":true,"sender":{"key":"martin.langhoff@gmail.com","avatar":"https://gravatar.com/avatar/1e3f311b6c4c15836501901ca58f8c0b0667246488084ba524d8bc9867e22fd9?d=mp&s=160"},"body":"On 9/30/05, Elfyn McBratney <beu@gentoo.org> wrote:\n> > +        $ chgroup gitcommit /var/git\n>\n> s/chgroup/chgrp/\n\nOoops! Thanks for catching that\n\n> > +        $ chmod  2775 /var/git\n> > +        $ mkdir -p /var/git/projectname.git\n> > +        $ GIT_DIR=/var/git/projectname.git git-init-db\n>\n> Hmm .. if you're you're going to be using cogito anyway, might it be an\n> idea to instead do:\n>\n>         $ GIT_DIR=/var/git/projectname.git/.git cg-init [-I]\n\nYou only really need git on the repo server, and I think that's a plus.\n\n> > +        $ git-push  remoteserver:/var/git/projectname.git master branchname\n>\n> Ditto here, tho' that'll require that remotes have been set-up, of\n> course. ;)\n\nYes, the cogito way of doing this seems messy. Is there a simple way\nto set up the remote branch and push to it?\n\ncheers,\n\n\nmartin\n"},{"id":"9514","messageId":"20050929221926.GB13542@zippy.emcb.local","threadId":"1974","inReplyTo":"46a038f905092914524d3cd8c1@mail.gmail.com","subject":"Re: [PATCH] Cogito README: add a block describing team workflow with git+ssh","fromName":"Elfyn McBratney","fromEmail":"beu@gentoo.org","sentAt":"2005-09-29T22:19:26Z","receivedAt":"2005-09-29T22:19:26Z","isPatch":true,"sender":{"key":"beu@gentoo.org","avatar":null},"body":"On Fri, Sep 30, 2005 at 09:52:11AM +1200, Martin Langhoff wrote:\n > On 9/30/05, Elfyn McBratney <beu@gentoo.org> wrote:\n > > > +        $ chgroup gitcommit /var/git\n > >\n > > s/chgroup/chgrp/\n > \n > Ooops! Thanks for catching that\n\nNp :)\n\n > > > +        $ chmod  2775 /var/git\n > > > +        $ mkdir -p /var/git/projectname.git\n > > > +        $ GIT_DIR=/var/git/projectname.git git-init-db\n > >\n > > Hmm .. if you're you're going to be using cogito anyway, might it be an\n > > idea to instead do:\n > >\n > >         $ GIT_DIR=/var/git/projectname.git/.git cg-init [-I]\n > \n > You only really need git on the repo server, and I think that's a plus.\n\n*nods*\n\n > > > +        $ git-push  remoteserver:/var/git/projectname.git master branchname\n > >\n > > Ditto here, tho' that'll require that remotes have been set-up, of\n > > course. ;)\n > \n > Yes, the cogito way of doing this seems messy. Is there a simple way\n > to set up the remote branch and push to it?\n\nNot that I know of, tho' I'm still quite new to cogito, mind. ;)\n\nBest,\nElfyn\n\n-- \nElfyn McBratney\nGentoo Developer/Perl Team Lead\nbeu/irc.freenode.net                            http://dev.gentoo.org/~beu/\n+------------O.o--------------------- http://dev.gentoo.org/~beu/pubkey.asc\n\nPGP Key ID: 0x69DF17AD\nPGP Key Fingerprint:\n  DBD3 B756 ED58 B1B4 47B9  B3BD 8D41 E597 69DF 17AD\n"}]}