diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-07-27 21:11:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-27 21:11:34 -0700 |
| commit | 5000caa3069e8627abfaff49c65a7daeb81c17fa (patch) | |
| tree | a12104039dfb1e55629a4fea6ecf61bf68355020 /builtin | |
| parent | Merge branch 'jc/test-lib-source-build-options-early' (diff) | |
| parent | checkout: don't confuse ref and object flags (diff) | |
| download | tgif-5000caa3069e8627abfaff49c65a7daeb81c17fa.tar.xz | |
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |