Tools » teuthology

Right now, according to this:
http://ceph.com/git/?p=teuthology.git;a=commit

HEAD is 657bd369d04f44c74fedfde52264ad49886dbb7d

So, what's going on here?

teuthology@teuthology:~/teuthology$ git fetch -u -p origin master; git branch -v
From git://ceph.com/git/teuthology
 * branch            master     -> FETCH_HEAD
* master f557ac5 Add a debug statement to reset_repo()
teuthology@teuthology:~/teuthology$ cat .git/refs/remotes/origin/master
f557ac5f8c490e6b7ebc873049eb1aaa47f8003b

Yeah something weird going here with fetch?

teuthology@teuthology:~/teuthology$ git fetch -u -p origin master; git branch -v
From git://ceph.com/git/teuthology
 * branch            master     -> FETCH_HEAD
* master f557ac5 Add a debug statement to reset_repo()

teuthology@teuthology:~/teuthology$ git pull
From git://ceph.com/git/teuthology
   f557ac5..657bd36  master     -> origin/master
Updating f557ac5..657bd36
Fast-forward
 teuthology/suite.py |   22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)
teuthology@teuthology:~/teuthology$ git branch -v
* master 657bd36 Fix the incomplete substitute_placeholders() fix

I don't see how I can fix this if I don't have access to a working git fetch

this doesn't work...

teuthology@teuthology:~/teuthology$ git fetch -u -p origin master; git branch -vFrom git://ceph.com/git/teuthology
 * branch            master     -> FETCH_HEAD
* master 657bd36 Fix the incomplete substitute_placeholders() fix

but this works:

teuthology@teuthology:~/teuthology$ git fetch -p origin
From git://ceph.com/git/teuthology
   657bd36..36441a2  master     -> origin/master

so let's just do git fetch -p and then git reset --hard origin/master ?