summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-28 04:11:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-28 04:11:34 (GMT)
commit5000caa3069e8627abfaff49c65a7daeb81c17fa (patch)
treea12104039dfb1e55629a4fea6ecf61bf68355020
parentcdd159b2f56c9e69e37bbb8f5af301abd93e5407 (diff)
parentadd416a6c05b580e005726f318463698d746384d (diff)
downloadgit-5000caa3069e8627abfaff49c65a7daeb81c17fa.zip
git-5000caa3069e8627abfaff49c65a7daeb81c17fa.tar.gz
git-5000caa3069e8627abfaff49c65a7daeb81c17fa.tar.bz2
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
-rw-r--r--builtin/checkout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 6acca75..d812219 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;
}