GIT Integration Manager工作流程设置

Question

I am setting up an environment for our team and our contractor team to develop a project.

Our team is sitting in network A. Our contractor team is sitting in network B. For security reason, Network A and B will be connected once a day (or a few days). Both networks cannot be connected to the Internet.

We decided to adopt GIT's integration manager workflow approach. We plan to setup our central repo in Network A. Then, setup a integration manager repo in network B.

Contractor team's developers will pushed their changes to integration manager repo. A system analyst in the contractor team will review and rebase the codes before pushing to Central repo and pulling the changes we made to central repo.

I would like to ask:

1. Should integration manager repo be bare or not? I am confused after reading posts from the web. If it cannot be bare, then should I set receive.denycurrentbranch=refuse or updateInstead?

2. Should the contractor's system analyst rebase codes in integration manager? If not, then what is the proper way to rebase the codes by the SA before pushing the changes to central repo?

Answer 1

Should integration manager repo be bare or not?

It is better for any repo your are pushing to to be bare.
The integrator can then pull to his/her own integration repo (which is not bare), and have a look there. (while the network is closed again)

Once the integrator has done the integration job, he/she can push to a networkA bare repo acting as a referential, and colleague can pull --rebase from it.
A pull -rebase would help rebase any local (not yet pushed) commits on top of the updated remote branch. See also " Can “ git pull ” automatically stash and pop pending changes? ".