Git repo: internal and open source external branches -


what best way set git repo project company uses internally, want open-source (but potentially modified history)?

let's acme company has repo "supercoolproject". want open source it, don't want company name associated @ all. set github account under 1 of developer's names (or group, etc), , create repo. clone internal acme server. "acme" mentioned.

now comes problem - in given organization there developers understand open source , authorized push code public. there others don't understand nuances. when 1 of these makes commit, perhaps include company name or other proprietary information. or, make horrible commit can reverted internally (not rewriting history - i'm talking adding "revert" commit). but, don't want proprietary commits going out open source branches.

so, create "acme_internal_{dev,qa,production}" branches, , external "master" branch (and maybe others). what's best way keep in sync? want accept commits on open source repos. , want push (most of) internal commits out. there shouldn't go out.

it seems merging internal -> external bad thing because can't remove bad commits. rebasing external branches on internal ones done, seems "git rebase -i acme/acme_internal_dev" 1 time , modify history (change commit messages, remove commits, etc) can no longer rebase because 2 histories diverge. so, end cherry-picking internal commits out public branch , merging public branch internal tree? seems ugly because end duplicated commits internally (the original, , cherry-picked 1 went external , merged internal).

for purpose of question, let's assume internally acme wants avoid rewriting history (actually removing/modifying bad commmits) on internal branches.

there few measures can take leverage dvcs nature of dual repo want maintain.

first, never directly expose internal repo world (with idea of having "external" branch). there no such thing "external branch", "external -- or 'public' repos".

a possible setup have repo exposed world (to external contributors can push or pull from).

second, never push (from within acme) directly external repo: mistakes done, , don't control @ pace pulls done. ie, once push wrong stuff, swift correction might come late.

you need intermediate repo, still managed internally, review purpose. ie inspect has been pushed, and, if new commits ok, pull them external repo.
means external repo knows intermediate repo (it has listed in remotes), reverse not true (you cannot push mistake internal repo).
makes more explicit publication process (you must go external repo server , pull changes want publish, opposed of staying in familiar internal environment, , pushing carelessly)

make use, on intermediate repo (the 1 acme's developers can push review before publishing), of:

  • pre-receive hooks (to make kinds of controls: if commit doesn't meet criteria publication, rejected , developer can rewrite history in his/her own repo).
    again, rewriting history acceptable, long control within acme's developers repos.
  • content filter driver (see instance this question), in order not have version different contents between 2 kind of repo sensitive files (as in "something gitignore not git ignore").

Comments

Post a Comment

Popular posts from this blog

java - Play! framework 2.0: How to display multiple image? -

i need display gallery of photos. here template: @(photos: list[photo]) @title = { <bold>gallery</bold> } @main(title,"photo"){ <ul class="thumbnails"> @for(photo <- photos) { <li class="span3"> <a href="#" class="thumbnail"> <img src="@photo.path" alt=""> </a> </li> } </ul> } and here controller method: public static result getphotos() { return ok(views.html.photo.gallery.render(photo.get())); } and here photo bean : @entity public class photo extends model { @id public long id; @required public string label; public string path; public photo(string path, string label) { this.path = path; this.label = label; } private static finder<long, photo> find = new finder<long, photo>( long.class, photo.class); public static list<phot...
Read more

gmail - Is there any documentation for read-only access to the Google Contacts API? -

i want read-only access user's google contacts. there stackoverflow member wanted this, , received following answer : yes, there is, use https://www.googleapis.com/auth/contacts.readonly scope , "view contacts". this exchange reference read-only access google contacts can find using google. simply using access token obtained attempt read usual google contacts api (i.e. https://www.google.com/m8/feeds ) fails insufficient permissions. similarly, using google contacts api on new target fails 404 errors (for example https://www.googleapis.com/auth/contacts.readonly/default/full ). is there documentation anywhere on how use api, or permissible way access google contacts api full read-write access?
Read more

php - Controller/JToolBar not working in Joomla 2.5 -

relevant code: jtoolbarhelper::custom('savecategories', 'save', '', 'save', false, false); ... <input type="hidden" name="controller" value="easyblogcontroller"> according can dig docs , own previous questions, should call savecategories() function in easyblogcontroller . i've tried setting value easyblog , easyblog.php (file name) current easyblogcontroller (class name). clicking on save button refreshes page. not redirect, echo or var_dump test code put in savecategories() function. var_dump ing jrequest::getvar('controller') , 'task' return correct values. creating controller object , using $controller->execute('task'); works. the values going depend on location of controller trying call, , have couple options here. typically there controller in base folder of component (likely components/com_easyblog) in file called controller.php , class name inside ...
Read more