summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-06 22:31:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-08-06 22:31:16 (GMT)
commit1b8e822e572f3c86e0c0d1e9e8bc29d016a4e3d3 (patch)
treea41decae00ba264e06d5b43a9ca171581fa5f3f7
parenteb536007df3dff31b6f4733c8455e195e0731426 (diff)
parentadd416a6c05b580e005726f318463698d746384d (diff)
downloadgit-1b8e822e572f3c86e0c0d1e9e8bc29d016a4e3d3.zip
git-1b8e822e572f3c86e0c0d1e9e8bc29d016a4e3d3.tar.gz
git-1b8e822e572f3c86e0c0d1e9e8bc29d016a4e3d3.tar.bz2
Merge branch 'jk/maint-checkout-orphan-check-fix' into maint
* 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 3980d5d..e060efb 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -605,7 +605,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;
}