Skip to content

Commit 99321e3

Browse files
committed
Merge branch 'nd/object-allocation-comments'
Code doc update. * nd/object-allocation-comments: object.h: realign object flag allocation comment object.h: update flag allocation comment
2 parents 88506cb + 3d1cf1e commit 99321e3

File tree

5 files changed

+20
-12
lines changed

5 files changed

+20
-12
lines changed

builtin/index-pack.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ struct thread_local {
4949
int pack_fd;
5050
};
5151

52+
/* Remember to update object flag allocation in object.h */
5253
#define FLAG_LINK (1u<<20)
5354
#define FLAG_CHECKED (1u<<21)
5455

builtin/pack-objects.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2549,6 +2549,7 @@ static void read_object_list_from_stdin(void)
25492549
}
25502550
}
25512551

2552+
/* Remember to update object flag allocation in object.h */
25522553
#define OBJECT_ADDED (1u<<20)
25532554

25542555
static void show_commit(struct commit *commit, void *data)

builtin/reflog.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ struct collect_reflog_cb {
5252
int nr;
5353
};
5454

55+
/* Remember to update object flag allocation in object.h */
5556
#define INCOMPLETE (1u<<10)
5657
#define STUDYING (1u<<11)
5758
#define REACHABLE (1u<<12)

builtin/unpack-objects.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ struct obj_info {
158158
struct object *obj;
159159
};
160160

161+
/* Remember to update object flag allocation in object.h */
161162
#define FLAG_OPEN (1u<<20)
162163
#define FLAG_WRITTEN (1u<<21)
163164

object.h

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,22 @@ struct object_array {
2828
#define TYPE_BITS 3
2929
/*
3030
* object flag allocation:
31-
* revision.h: 0---------10 26
32-
* fetch-pack.c: 0---5
33-
* walker.c: 0-2
34-
* upload-pack.c: 4 11----------------19
35-
* builtin/blame.c: 12-13
36-
* bisect.c: 16
37-
* bundle.c: 16
38-
* http-push.c: 16-----19
39-
* commit.c: 16-----19
40-
* sha1_name.c: 20
41-
* list-objects-filter.c: 21
42-
* builtin/fsck.c: 0--3
31+
* revision.h: 0---------10 26
32+
* fetch-pack.c: 0----5
33+
* walker.c: 0-2
34+
* upload-pack.c: 4 11----------------19
35+
* builtin/blame.c: 12-13
36+
* bisect.c: 16
37+
* bundle.c: 16
38+
* http-push.c: 16-----19
39+
* commit.c: 16-----19
40+
* sha1_name.c: 20
41+
* list-objects-filter.c: 21
42+
* builtin/fsck.c: 0--3
43+
* builtin/index-pack.c: 2021
44+
* builtin/pack-objects.c: 20
45+
* builtin/reflog.c: 10--12
46+
* builtin/unpack-objects.c: 2021
4347
*/
4448
#define FLAG_BITS 27
4549

0 commit comments

Comments
 (0)