[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Rescue Plan for apt-listbugs



On Sat, Oct 9, 2010 at 4:58 AM, Francesco Poli <frx@firenze.linux.it> wrote:

> However, I still need confirmation that the git work-flow I am planning
> to follow won't mess everything up.
> Could someone please review it (see <http://bugs.debian.org/588636#39>)?

A few minor issues, but it looks good.

> $ git clone git://git.debian.org/git/apt-listbugs/apt-listbugs.git
> $ git remote add alioth ssh://git.debian.org/git/apt-listbugs/apt-listbugs.git

You should not need to add a second remote, it feels weird to have two
remotes to the same repository. I would just do the initial clone over
ssh.

> $ git checkout -b $MY_COOL_BRANCH_NAME origin

You want origin/master here.

> $ git checkout $MY_COOL_BRANCH_NAME && git rebase origin

Probably s/origin/master/

> $ git push alioth ${MY_COOL_BRANCH_NAME}:master

I've never used that syntax before, interesting.

I would also suggest that before you push, either judicious use of git
add -p for preparing commits into logical changes or use of git rebase
-i after the fact to reorganise them into logical changes. Also,
ensuring that each commit builds and passes any test suite helps folks
doing bisects etc on the repo at a later date.

Also chuck in git stash and git bisect.

-- 
bye,
pabs

http://wiki.debian.org/PaulWise


Reply to: