From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 28 Jul 2012 04:11:33 +0000 (-0700)
Subject: Merge branch 'jk/maint-checkout-orphan-check-fix'
X-Git-Tag: v1.7.12-rc1~14
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/5000caa3069e8627abfaff49c65a7daeb81c17fa?hp=cdd159b2f56c9e69e37bbb8f5af301abd93e5407

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

"git checkout <branchname>" to come back from a detached HEAD state
incorrectly computed reachability of the detached HEAD, resulting in
unnecessary warnings.

* 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 6acca75f47..d812219b30 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -606,7 +606,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;
 }