Re: [PATCH 1/3] prepare_packed_git(): find more garbage
- From
Doug Kelly <dougk.ff7@gmail.com>
- Date
- Nov 26, 2015, 06:18 UTC
- Message-ID
- <CAEtYS8RHk8dbXs2jBRaCDkOHNEEFHWOxCAMFHY9+wJhWSSFpYQ@mail.gmail.com>
- In-Reply-To
- <CAGZ79kaCNT06mAGQbHNgZmdBQUyxGFTFA2Y2FXvG2UG+P7s2kg@mail.gmail.com>
Apparently, I fixed this and forgot to re-run format-patch, so I sent out the same patch the second time... My fault on that one. I've at least checked what I sent this time around, and it seems to match what's in my current tree. :) The second and third patches should be unmodified.
Thanks for catching that, Stefan!
On Wed, Nov 25, 2015 at 12:43 PM, Stefan Beller <sbeller@google.com> wrote:
Show 12 quoted lines
> On Fri, Nov 13, 2015 at 4:46 PM, Doug Kelly <dougk.ff7@gmail.com> wrote: >> return "no corresponding .idx"; >> - case PACKDIR_FILE_IDX: >> + else if (seen_bits & PACKDIR_FILE_IDX && seen_bits ^ ~PACKDIR_FILE_PACK) > > Did you intend to use > (seen_bits & PACKDIR_FILE_IDX && !(seen_bits & PACKDIR_FILE_PACK)) > here? > > I was just looking at the state in peff/pu and it still has the xor > variant, which exposes more > than just the selected bit to the decision IIRC.