Merge branch 'jk/maint-checkout-orphan-check-fix' into maint

* jk/maint-checkout-orphan-check-fix: checkout: don't confuse ref and object flags
git-mirror · Aug 6, 2012 · 1b8e822 · 1b8e822
2 parents eb53600 + add416a
commit 1b8e822
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;
 }