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

gitster · gitster · commit 1b8e822e572f · 2012-08-06T15:31:16.000-07:00
* jk/maint-checkout-orphan-check-fix:
  checkout: don't confuse ref and object flags
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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -605,7 +605,7 @@ static int add_pending_uninteresting_ref(const char *refname,`
`605`	`605`	`const unsigned char *sha1,`
`606`	`606`	`int flags, void *cb_data)`
`607`	`607`	`{`
`608`		`- add_pending_sha1(cb_data, refname, sha1, flags \| UNINTERESTING);`
	`608`	`+ add_pending_sha1(cb_data, refname, sha1, UNINTERESTING);`
`609`	`609`	`return 0;`
`610`	`610`	`}`
`611`	`611`