| Message ID | 38c96fc1909162a4d9c188f55b7c708cfc1b14b9.1716318089.git.me@ttaylorr.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | pack-bitmap: pseudo-merge reachability bitmaps | expand |
On Tue, May 21, 2024 at 03:01:48PM -0400, Taylor Blau wrote: > In commit 7cc8f971085 (pack-objects: implement bitmap writing, > 2013-12-21) the NEEDS_BITMAP flag was introduced into pack-bitmap.h, but > no object flags allocation table existed at the time. Oops. When I prepared these patches for the list, I told format-patch that the base was origin/master, not @{u}. The correct upstream on which patch 7 and onwards is based is 'tb/pack-bitmap-write-cleanups' as I wrote in the cover letter. Junio: please ignore this patch and apply patches 7-30 on top of your 'tb/pack-bitmap-write-cleanups'. Thanks, Taylor
diff --git a/object.h b/object.h index 9293e703ccc..99b9c8f114c 100644 --- a/object.h +++ b/object.h @@ -81,6 +81,7 @@ void object_array_init(struct object_array *array); * reflog.c: 10--12 * builtin/show-branch.c: 0-------------------------------------------26 * builtin/unpack-objects.c: 2021 + * pack-bitmap.h: 22 */ #define FLAG_BITS 28
In commit 7cc8f971085 (pack-objects: implement bitmap writing, 2013-12-21) the NEEDS_BITMAP flag was introduced into pack-bitmap.h, but no object flags allocation table existed at the time. In 208acbfb82f (object.h: centralize object flag allocation, 2014-03-25) when that table was first introduced, we never added the flags from 7cc8f971085, which has remained the case since. Rectify this by including the flag bit used by pack-bitmap.h into the centralized table in object.h. Signed-off-by: Taylor Blau <me@ttaylorr.com> --- object.h | 1 + 1 file changed, 1 insertion(+)