Merge branch 'jk/maint-checkout-orphan-check-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:31:16 +0000 (15:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:31:16 +0000 (15:31 -0700)
* jk/maint-checkout-orphan-check-fix:
  checkout: don't confuse ref and object flags

1  2 
builtin/checkout.c

Simple merge