Subject: bug#17724: 24.4.50; regression: error "`recenter'ing a window that does not display current-buffer." when opening org-mode file

From: Nicolas Richard <[email-masked]>
Date: Thu, 19 Jun 2014 22:29:38 +0200

Gregor Zattler <[email-masked]> writes:
> s$ git branch -a --contains HEAD
> * emacs-24
> master
> remotes/origin/HEAD -> origin/master
> remotes/origin/master
> remotes/origin/trunk

So indeed your local emacs-24 branch points in fact to a commit from
trunk.

I think running those commands should fix the problem:
git branch -u origin/emacs-24
git reset --hard origin/emacs-24

-- 
Nico.