Merge branch 'jk/maint-checkout-orphan-check-fix' into maint
commit1b8e822e572f3c86e0c0d1e9e8bc29d016a4e3d3
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:31:16 +0000 (6 15:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:31:16 +0000 (6 15:31 -0700)
treea41decae00ba264e06d5b43a9ca171581fa5f3f7
parenteb536007df3dff31b6f4733c8455e195e0731426
parentadd416a6c05b580e005726f318463698d746384d
Merge branch 'jk/maint-checkout-orphan-check-fix' into maint

* jk/maint-checkout-orphan-check-fix:
  checkout: don't confuse ref and object flags
builtin/checkout.c