DevHeads.net

kde-workspace/4.9 messed up

Hi,

somehow the master branch of kde-workspace has been merged in the
KDE/4.9 branch, with obvious consequences.
Can anyone please fix this mess?

Thanks,

Comments

Re: kde-workspace/4.9 messed up

By Christoph Feck at 11/11/2012 - 06:48

On Sunday 11 November 2012 12:00:05 Pino Toscano wrote:
Uh oh, I think I did "git reset origin/HEAD --hard" in the 4.9 branch,
to get rid of an initial commit I made in that branch. So HEAD doesn't
refer to the remote head in the current branch, but always to the head
of master?

Christoph Feck (kdepepo)

Re: kde-workspace/4.9 messed up

By Stephen Kelly at 11/11/2012 - 09:56

Something like that. It's similar to the mess that was just fixed yesterday
in kdelibs:

<a href="http://thread.gmane.org/gmane.comp.kde.devel.core/76984" title="http://thread.gmane.org/gmane.comp.kde.devel.core/76984">http://thread.gmane.org/gmane.comp.kde.devel.core/76984</a>

Amazing that two people make the same mistake in such a short time, after
such a long time without a similar issue.

Someone needs to force-push the branch. Sysadmin knows what to do, so please
talk to them to get it fixed.

Thanks,

Steve.

Re: kde-workspace/4.9 messed up

By Ben Cooksley at 11/11/2012 - 14:10

Hi all,

This has now been corrected - KDE/4.9 has been rewound to
f7fb0c10fa6bc04082963fa5863c579d560dc4a1.
I have also blacklisted one of the commit hashes so this cannot
re-enter the repository.

You need to run "git reset --hard origin/KDE/4.9" with the KDE/4.9
branch checked out to reset yourself to a state where you will be able
to push again if you work on the KDE/4.9 branch.

(As an aside, local HEAD always points to the branch you have checked
out - origin/HEAD points to the default checkout branch of the remote
repository)

Regards,
Ben Cooksley
KDE Sysadmin

Re: kde-workspace/4.9 messed up

By Thiago Macieira at 11/11/2012 - 09:12

On domingo, 11 de novembro de 2012 12.48.15, Christoph Feck wrote:
HEAD is a branch. It's not symbolic like it was in SVN or CVS (the tip of a
given branch). By default, HEAD is actually a symbolic ref -- it points to
another ref.

$ cat .git/refs/remotes/origin/HEAD
ref: refs/remotes/origin/master

So you see exactly what origin/HEAD is.

You can also change it (locally) using git remote set-head.