From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Aug 2012 22:31:16 +0000 (-0700)
Subject: Merge branch 'jk/maint-checkout-orphan-check-fix' into maint
X-Git-Tag: v1.7.12-rc2~2^2~9
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/1b8e822e572f3c86e0c0d1e9e8bc29d016a4e3d3?hp=eb536007df3dff31b6f4733c8455e195e0731426

Merge branch 'jk/maint-checkout-orphan-check-fix' into maint

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

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 3980d5d06e..e060efb2a2 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -605,7 +605,7 @@ static int add_pending_uninteresting_ref(const char *refname,
 					 const unsigned char *sha1,
 					 int flags, void *cb_data)
 {
-	add_pending_sha1(cb_data, refname, sha1, flags | UNINTERESTING);
+	add_pending_sha1(cb_data, refname, sha1, UNINTERESTING);
 	return 0;
 }