From: Enrico Weigelt <weigelt@metux.de>
To: git@vger.kernel.org
Subject: Re: workflow with blessed, lieutenant, and developers
Date: Fri, 13 Aug 2010 18:47:36 +0200 [thread overview]
Message-ID: <20100813164736.GA27540@nibiru.local> (raw)
In-Reply-To: <20100809092152.5f32646a@packard.rktmb.org>
* Mihamina Rakotomandimby <mihamina@gulfsat.mg> wrote:
Hi,
> I would like to setup a similar thing but with
> - Only one lieutenant (me)
> - A blessed repository where I am the only one to push to
> - Developers who push to me (the lieutenant)
if you really want them to push to you (instead of pull-requests),
you could set up an ssh-based git repo, which restricts your devs
to just their own branches (via .ssh/authorized_keys and wrapper
commands) and do whatever you like (eg. generating pull-requests,
open a ticked in some issue tracker, etc) in the post-update hook.
> 1°) What command line do developers use to push to me but not to the
> blessed (origin)?
> 2°) After they pushed to me, I have the choice to "approve" or "reject"
> a commit: what is the keyword and git option for that?
> 3°) I push the merge of approved commits to the blessed repository:
> what keywords and git options?
depends on your branch naming scheme.
man 1 git-push
you could even go some steps further and hack up wrappers/hooks
which let your dev's pushes to the main repo / mainline branch
to somewhere else (aka: masquerading). lets say your dev "Max"
pushes to master, this will actually create some new branch
"approveme/Max/$timestamp" instead of updating master itself.
now you can regularily look through these branches and decide
whether to merge or drop them.
(BTW: I'd recommend always rebasing to master before merging
into it - less chance of conflicts and cleaner history).
what you need is:
a) ssh key-authentication with individual per-user commands,
which pass the dev's pushes to intermediate/temporary
per-user repositories.
b) hack up an post-update hook in the intermediate repo(s),
which push their updates into the main repo with proper
rewritten ref names (eg. "approveme/$username/$timestamp).
cu
--
----------------------------------------------------------------------
Enrico Weigelt, metux IT service -- http://www.metux.de/
phone: +49 36207 519931 email: weigelt@metux.de
mobile: +49 151 27565287 icq: 210169427 skype: nekrad666
----------------------------------------------------------------------
Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme
----------------------------------------------------------------------
prev parent reply other threads:[~2010-08-13 16:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-09 6:21 workflow with blessed, lieutenant, and developers Mihamina Rakotomandimby
2010-08-09 7:42 ` Joshua Juran
2010-08-09 7:57 ` Matthieu Moy
2010-08-09 19:30 ` Jared Hance
2010-08-13 16:47 ` Enrico Weigelt [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100813164736.GA27540@nibiru.local \
--to=weigelt@metux.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).