Eclipse Community Forums: EGit / JGit » Rollink back the upstream master

Help

Home

Home » Eclipse Projects » EGit / JGit » Rollink back the upstream master

Show: Today's Messages :: Show Polls :: Message Navigator

Rollink back the upstream master [message #1226970]

Fri, 03 January 2014 07:31

Ed Willink

Messages: 7655
Registered: July 2009

Senior Member

Hi

We inadvertently pushed a bad commit to our upstream master.

To clean up, I hoped that the normal downstream approach would work,
rename the bad branch, clearing the way for the good branch to take over.

Unfortunately there appears to be a privilieged status for the upstream
master branch. So we have an undeletable wrongMaster branch that is the
default branch for http://git.eclipse.org/c/ocl/org.eclipse.ocl.git and
a deletable master branch that represents our best endeavours.

Is there a way to transfer the privileged status from wrongMaster to master?

Regards

Ed Willink

Report message to a moderator

Re: Rollink back the upstream master [message #1227165 is a reply to message #1226970]

Fri, 03 January 2014 18:40

R Shapiro

Messages: 386
Registered: June 2011

Senior Member

One commit is bad? How bad is this bad commit? If it's just an error in one commit you can simply revert the commit and then push that reversion. No need for any new branches or anything else. If other related commits have happened since, you can revert them one at a time, in reverse order.

If the problem is that something got pushed that should never have been exposed, for instance for a security reasons, then you really need to get that commit out the history altogether, not just revert it or create a new branch. That topic isn't appropriate for an EGit forum. Do a web search for re-writing history in Git to find out more.

Regarding the 'privileged status' most likely that's just the value of the symbolic reference HEAD in the server repository. The reset command can be used to point HEAD somewhere else.

Report message to a moderator