From: Johannes Sixt <j.sixt@viscovery.net>
To: Eyal Zinder <ezinder@yahoo.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Problem setting up a shared git repository
Date: Fri, 06 Sep 2013 09:43:32 +0200 [thread overview]
Message-ID: <522987A4.1090702@viscovery.net> (raw)
In-Reply-To: <1378417432.91149.YahooMailNeo@web161803.mail.bf1.yahoo.com>
Am 9/5/2013 23:43, schrieb Eyal Zinder:
> I'm trying to setup a distributed development repository with a central
> repository acting as the production copy. I'm doing so on a Windows
> file share with no SSH / HTTP accessibility. Basically each developer
> will have their own copy of the project, and the shared drive should
> have a copy of the master copy (prod/master branch), along with the
> work-tree files.
>
> The idea is that any developer should be able to do independent
> development, staged commits, etc.. then push to the central (origin)
> repository, and production scripts will reflect these changes upon a
> push.
>
> I got pretty close to this setup by creating a bare repository on the
> file share server (f:\GitDBs\foo.git), then cloning the bare repository
> onto the production path like so: git clone f:\GitDBs\foo.git foo
The setup sounds reasonable.
> I cloned the bare repository just the same onto my local dev path.. and
> proceeded with development. This worked fine, and I was able to push /
> pull changes into "origin" (bare repo), and then I would go to my prod
> (f:\foo) repository (clone of bare f:\GitDBs\foo.git), then pull the
> changes..
So far my understanding is that your production directory only ever issues
pulls from the bare repository. That is OK.
> The problem I faced later on was in parallel development, when changes
> were made to a file in one repository, and at the same time other
> changes made to the same file in another repository.. I couldh't push
> changes from the dev\foo to prod\foo or to origin..
Define "couldn't push". What are the error messages? Is it important that
it is *the same file* to which changes were made at the same time?
Do you have receive.denyNonFastForwards set in the bare repository?
> I'm completely lost at the moment.. I try to set --git-dir or
> --work-tree and I get mixed results..
Don't do that, it should not be necessary in your setup.
-- Hannes
next prev parent reply other threads:[~2013-09-06 7:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-05 21:43 Problem setting up a shared git repository Eyal Zinder
2013-09-06 7:43 ` Johannes Sixt [this message]
2013-09-06 10:06 ` Konstantin Khomoutov
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=522987A4.1090702@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=ezinder@yahoo.com \
--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.
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).