Permalink
Browse files

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
  • Loading branch information...
2 parents cdd159b + add416a commit 5000caa3069e8627abfaff49c65a7daeb81c17fa @gitster gitster committed Jul 28, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 builtin/checkout.c
View
2 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;
}

0 comments on commit 5000caa

Please sign in to comment.