object.h: update flag allocation comment
PATCH 1/2 object.h: update flag allocation comment
Since the "flags" is shared, it's a good idea to keep track of who uses what bit. When we need to use more flags in library code, we can be sure it won't be re-used for another purpose by some caller.
While at there, fix the location of "5" (should be in a different column than "4" two lines down)
Signed-off-by Nguyễn Thái Ngọc Duy <[email protected]>
--- builtin/index-pack.c | 1 + builtin/pack-objects.c | 1 + builtin/reflog.c | 1 + builtin/unpack-objects.c | 1 + object.h | 6 +++++- 5 files changed, 9 insertions(+), 1 deletion(-)
builtin/index-pack.c +1 -0
@@ -49,6 +49,7 @@ struct thread_local {int pack_fd; }; +/* Remember to update object flag allocation in object.h */ #define FLAG_LINK (1u<<20)#define FLAG_CHECKED (1u<<21)
builtin/pack-objects.c +1 -0
@@ -2549,6 +2549,7 @@ static void read_object_list_from_stdin(void) } } +/* Remember to update object flag allocation in object.h */ #define OBJECT_ADDED (1u<<20)static void show_commit (struct commit *commit,void *data)
builtin/reflog.c +1 -0
@@ -52,6 +52,7 @@ struct collect_reflog_cb {int nr; }; +/* Remember to update object flag allocation in object.h */ #define INCOMPLETE (1u<<10)#define STUDYING (1u<<11)#define REACHABLE (1u<<12)
builtin/unpack-objects.c +1 -0
@@ -158,6 +158,7 @@ struct obj_info {struct object *obj; }; +/* Remember to update object flag allocation in object.h */ #define FLAG_OPEN (1u<<20)#define FLAG_WRITTEN (1u<<21)
object.h +5 -1
@@ -29,7 +29,7 @@ struct object_array {/* * object flag allocation: * revision.h: 0---------10 26 -* fetch-pack.c: 0---5 +* fetch-pack.c: 0----5 * walker.c: 0-2 * upload-pack.c: 4 11----------------19 * builtin/blame.c: 12-13
@@ -40,6 +40,10 @@ struct object_array {* sha1_name.c: 20 * list-objects-filter.c: 21 * builtin/fsck.c: 0--3 +* builtin/index-pack.c: 2021 +* builtin/pack-objects.c: 20 +* builtin/reflog.c: 10--12 +* builtin/unpack-objects.c: 2021 */ #define FLAG_BITS 27
Signature · 1 line
2.16.2.784.gb291bd247e
PATCH 2/2 object.h: realign object flag allocation comment
Some new path names are too long and eat into the graph part. Move the graph 9 columns to the right to avoid this.
Signed-off-by Nguyễn Thái Ngọc Duy <[email protected]>
--- object.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
object.h +16 -16
@@ -28,22 +28,22 @@ struct object_array {#define TYPE_BITS 3/* * object flag allocation: -* revision.h: 0---------10 26 -* fetch-pack.c: 0----5 -* walker.c: 0-2 -* upload-pack.c: 4 11----------------19 -* builtin/blame.c: 12-13 -* bisect.c: 16 -* bundle.c: 16 -* http-push.c: 16-----19 -* commit.c: 16-----19 -* sha1_name.c: 20 -* list-objects-filter.c: 21 -* builtin/fsck.c: 0--3 -* builtin/index-pack.c: 2021 -* builtin/pack-objects.c: 20 -* builtin/reflog.c: 10--12 -* builtin/unpack-objects.c: 2021 +* revision.h: 0---------10 26 +* fetch-pack.c: 0----5 +* walker.c: 0-2 +* upload-pack.c: 4 11----------------19 +* builtin/blame.c: 12-13 +* bisect.c: 16 +* bundle.c: 16 +* http-push.c: 16-----19 +* commit.c: 16-----19 +* sha1_name.c: 20 +* list-objects-filter.c: 21 +* builtin/fsck.c: 0--3 +* builtin/index-pack.c: 2021 +* builtin/pack-objects.c: 20 +* builtin/reflog.c: 10--12 +* builtin/unpack-objects.c: 2021 */ #define FLAG_BITS 27
Signature · 1 line
2.16.2.784.gb291bd247e