Skip to content

Commit

Permalink
Merge branch 'jk/maint-checkout-orphan-check-fix'
Browse files Browse the repository at this point in the history
"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
Junio C Hamano committed Jul 28, 2012
2 parents cdd159b + add416a commit 5000caa
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion builtin/checkout.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 5000caa

Please sign in to comment.