object.h: update flag allocation comment

pclouds · gitster · commit 95308d64ce43 · 2018-03-06T11:41:21.000-08:00
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 &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
@@ -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)
 
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
@@ -2546,6 +2546,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)
diff --git a/builtin/reflog.c b/builtin/reflog.c
@@ -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)
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
@@ -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)
 
diff --git a/object.h b/object.h
@@ -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
 

Original file line number	Diff line number	Diff line change
`@@ -2546,6 +2546,7 @@ static void read_object_list_from_stdin(void)`
`2546`	`2546`	`}`
`2547`	`2547`	`}`
`2548`	`2548`
	`2549`	`+/* Remember to update object flag allocation in object.h */`
`2549`	`2550`	`#define OBJECT_ADDED (1u<<20)`
`2550`	`2551`
`2551`	`2552`	`static void show_commit(struct commit commit, void data)`