Comment 4 for bug 1044695

tl; dr:

0.1.2 tags a merge commit which was never pushed to master

the merge commit only has one parent, and there are no other commits in 0.1.2 which didn't land on master

in more detail:

0.1.2 is on pypi and there's a tag for it in the github repo

It looks like we wanted to release commit dec8f77 as 0.1.2, which is 16 commits after 0.1.1:

  $> git log --oneline 0.1.1..dec8f77 | wc -l
  16

however, there's an extra commit in 0.1.2:

  $> git log --oneline 0.1.1..0.1.2 | wc -l
  17

and that commit is:

  git log --pretty=raw origin/master..0.1.2
  commit e34c33167182a18dd93036cd3cad993a161e9d52
  tree c8781c661b86f4eb67b9f562e8285819abb7ce4c
  parent dec8f77c9233f195999b8db9adbd4f026834fd42
  author Joe Heck <email address hidden> 1343424423 -0700
  committer Joe Heck <email address hidden> 1343424423 -0700

      Merge branch 'master', remote-tracking branch 'origin'

Note that this is a merge commit with only one parent ... very strange