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
This commit is contained in:
commit
5000caa306
@ -606,7 +606,7 @@ static int add_pending_uninteresting_ref(const char *refname,
|
|||||||
const unsigned char *sha1,
|
const unsigned char *sha1,
|
||||||
int flags, void *cb_data)
|
int flags, void *cb_data)
|
||||||
{
|
{
|
||||||
add_pending_sha1(cb_data, refname, sha1, flags | UNINTERESTING);
|
add_pending_sha1(cb_data, refname, sha1, UNINTERESTING);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user