matplotlib-devel Mailing List for matplotlib

Hi Paul,
On Thu, Mar 24, 2011 at 2:55 AM, Paul Ivanov <piv...@gm...> wrote:
> Paul Ivanov, on 2011年03月24日 01:30, wrote:
>> I offer my sincerest apologies, I royally screwed up and thought
>> that I was pushing out to one of my own branches and somehow
>> ended up pushing a 2 day old copy of master out to
>> matplotlib/master with 'git push -f'. Assuming Mike's work from
>> today is also in his own master branch, I think the damage can be
>> undone by just pulling from
>> https://github.com/mdboom/matplotlib/master and pushing that to
>> https://matplotlib/matplotlib/master, but at this point I don't
>> trust myself and just want to not cause any more damage than I've
>> already done.
>>
>> I realize that people get their commit right revoked for such
>> careless shenanigans, but I will be grateful if you'd all allow
>> me the opportunity always run any push commands with the
>> --dry-run flag from now on.
>
> I can't figure out a way to pull it from there, but I think Eric
> was the last to commit to trunk before I (destructively) pushed
> my stale copy. Eric's last commit hash was:
> 8506c33c811e970c6aa73a446d3ed223ac48f989
>
> At least that's what I see on https://github.com/organizations/matplotlib
>
> hopefully this will help someone who get git better than I do.
Welcome to the wonderful world of git and DVCS!
I think you could have solved this one by:
git reset --hard 8506c33c811e970c6aa73a446d3ed223ac48f989
and pushing that. Assuming you had that commit, which I guess you would have.
The way I try and avoid doing that very easy thing is
1) Having a moderately frightening name for the upstream remote like
'upstream-rw'.
2) Having a moderately frightening name for the tracking branch like:
git co -b main-master --track upstream-rw/master
3) Making sure I've got the git-completion bash command line
completion tools working, so I can always see my branch name
4) Never working on main-master, always branching, and merging when I'm sure.
5) Deleting my own master branch to avoid confusion. This involves:
Going to your github fork, choosing Admin, set default branch to be
something other than 'master'
git co that-other-branch
git branch -D master # delete locally
git push origin :master # delete on github
Every error, is a jewel.
See you,
Matthew

On Thu, Mar 24, 2011 at 7:28 AM, Jouni K. Seppänen <jk...@ik...> wrote:
> Paul Ivanov <piv...@gm...> writes:
>
>> I can't figure out a way to pull it from there, but I think Eric
>> was the last to commit to trunk before I (destructively) pushed
>> my stale copy. Eric's last commit hash was:
>> 8506c33c811e970c6aa73a446d3ed223ac48f989
>
> The git and ssh transports will only fetch branches and tags, but I was
> able to get this commit with git http-fetch. I pushed it to master, so
> it should be fine now.
>
> Avoid using git push -f from now on, OK? :-)
Thanks Jouni. "git push -f" does not exist to me when pushing upstream.

Paul Ivanov <piv...@gm...> writes:
> I can't figure out a way to pull it from there, but I think Eric
> was the last to commit to trunk before I (destructively) pushed
> my stale copy. Eric's last commit hash was:
> 8506c33c811e970c6aa73a446d3ed223ac48f989
The git and ssh transports will only fetch branches and tags, but I was
able to get this commit with git http-fetch. I pushed it to master, so
it should be fine now.
Avoid using git push -f from now on, OK? :-)
-- 
Jouni K. Seppänen
http://www.iki.fi/jks

On Mar 24, 2011, at 4:59 AM, John Hunter <jd...@gm...> wrote:
> 
> With git you can clean up bad commits by simply changing the reference to master, or reorder and edit commits with rebase. Darren, can you take a look and see what should be done? It may be more complicated when you have multiple forks and branches, this part I'm less clear on so perhaps Darren you can comment on this too. 
> 
Paul, just an FYI, the section "to reset, or not to reset" on page 24 of "git from the bottom up" discusses resetting the head to prior commits. 
http://ftp.newartisans.com/pub/git.from.bottom.up.pdf
But we should let Darren (or someone with comparable git foo) make the call about the right way to repair the tree. 
JDH

On Mar 24, 2011, at 3:30 AM, Paul Ivanov <piv...@gm...> wrote:
> I offer my sincerest apologies, I royally screwed up and thought
> that I was pushing out to one of my own branches and somehow
> ended up pushing a 2 day old copy of master out to
> matplotlib/master with 'git push -f'. Assuming Mike's work from
> today is also in his own master branch, I think the damage can be
> undone by just pulling from
> https://github.com/mdboom/matplotlib/master and pushing that to
> https://matplotlib/matplotlib/master, but at this point I don't
> trust myself and just want to not cause any more damage than I've
> already done.
> 
> I realize that people get their commit right revoked for such
> careless shenanigans, but I will be grateful if you'd all allow
> me the opportunity always run any push commands with the
> --dry-run flag from now on.
With git you can clean up bad commits by simply changing the reference to master, or reorder and edit commits with rebase. Darren, can you take a look and see what should be done? It may be more complicated when you have multiple forks and branches, this part I'm less clear on so perhaps Darren you can comment on this too. 
Anyhow Paul, just an accident. Pales in comparison to my losing all of the ancient commit history in a CVS reorganization. 
> 

Paul Ivanov, on 2011年03月24日 01:30, wrote:
> I offer my sincerest apologies, I royally screwed up and thought
> that I was pushing out to one of my own branches and somehow
> ended up pushing a 2 day old copy of master out to
> matplotlib/master with 'git push -f'. Assuming Mike's work from
> today is also in his own master branch, I think the damage can be
> undone by just pulling from
> https://github.com/mdboom/matplotlib/master and pushing that to
> https://matplotlib/matplotlib/master, but at this point I don't
> trust myself and just want to not cause any more damage than I've
> already done.
> 
> I realize that people get their commit right revoked for such
> careless shenanigans, but I will be grateful if you'd all allow
> me the opportunity always run any push commands with the
> --dry-run flag from now on.
I can't figure out a way to pull it from there, but I think Eric
was the last to commit to trunk before I (destructively) pushed
my stale copy. Eric's last commit hash was:
8506c33c811e970c6aa73a446d3ed223ac48f989
At least that's what I see on https://github.com/organizations/matplotlib
hopefully this will help someone who get git better than I do.
best,
-- 
Paul Ivanov
314 address only used for lists, off-list direct email at:
http://pirsquared.org | GPG/PGP key id: 0x0F3E28F7 

I offer my sincerest apologies, I royally screwed up and thought
that I was pushing out to one of my own branches and somehow
ended up pushing a 2 day old copy of master out to
matplotlib/master with 'git push -f'. Assuming Mike's work from
today is also in his own master branch, I think the damage can be
undone by just pulling from
https://github.com/mdboom/matplotlib/master and pushing that to
https://matplotlib/matplotlib/master, but at this point I don't
trust myself and just want to not cause any more damage than I've
already done.
I realize that people get their commit right revoked for such
careless shenanigans, but I will be grateful if you'd all allow
me the opportunity always run any push commands with the
--dry-run flag from now on.
very sorry,
-- 
Paul Ivanov
314 address only used for lists, off-list direct email at:
http://pirsquared.org | GPG/PGP key id: 0x0F3E28F7