Git issue branch ... the sandbox route
Submitted by clemens on Wed, 2011/04/13 - 10:40am
I'm working on a patch to implement issue triage for Dreditor
But for ease of use and teasing in testers git issue branches would be great which are underways.
So in the mean time I use a sandbox for this. But how to get dreditor code into my repo?
- First create a sandbox on d.o. This gives to access to a new git repo.
- Ignore the initial git instructions
- Clone dreditor according the git instructions
git clone http://git.drupal.org/project/dreditor.git cd dreditor/
- Add your sandbox repository to this dreditor repo
git remote add triage-1115636 clemenstolboom@git.drupal.org:sandbox/clemenstolboom/1125712.git
- Now push the dreditor repo to your sandbox
git push triage-1115636 master
- Checkout you sandbox according to the new appeared sandbox git instructions ... don't forget to refresh the page.
cd .. git clone --branch master clemenstolboom@git.drupal.org:sandbox/clemenstolboom/1125712.git dreditor___triage____1115636 cd dreditor___triage____1115636
- Add dreditor to your sandbox to pull changed back
git remote add dreditor http://git.drupal.org/project/dreditor.git git remote show
-
Grabbing from dreditor needs a branch name too. This fails
git pull dreditor ... From http://git.drupal.org/project/dreditor * [new branch] master -> dreditor/master * [new branch] vbo -> dreditor/vbo You asked to pull from the remote 'dreditor', but did not specify a branch. Because this is not the default configured remote for your current branch, you must specify a branch on the command line.
- Follow along and add maser to the pull
clemens$ git pull dreditor master From http://git.drupal.org/project/dreditor * branch master -> FETCH_HEAD error: Your local changes to 'dreditor.user.js' would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge.
-
Do a stash for not losing changes ... blast ... it's now fuzzy
515 git stash --help 518 git stash branch autodiscovery # nope 519 git branch autodiscovery 520 git branch 521 git stash branch autodiscovery # nope 524 git st 525 git add dreditor.user.js 526 git stash branch autodiscovery # stashed ?!? 529 git stash Saved working directory and index state WIP on master: 61012aa Fixed round backets in DD HEAD is now at 61012aa Fixed round backets in DD
XRefs:
Git phase 3 : http://drupal.org/community-initiatives/git/phase-3
About status : http://drupal.org/node/156119
Dreditor sources : http://drupal.org/node/1120672
g.d.o : http://groups.drupal.org/issue-triage
Gnome : http://live.gnome.org/Bugsquad/TriageGuide
helmo : http://drupal.org/user/449000
Comments
Add another issue branch
When sitting on your own git repository how do you add a new issue branch based on the other repositories master.
Next you want to push this to your own remote repository.