diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-03-06 17:16:14 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-03-06 11:41:21 -0800 |
| commit | 95308d64ce43502507091ae5bbbdc41a918149ce (patch) | |
| tree | d90428d37a403c48be3c36bd54fe3c1bed4b9a23 | |
| parent | Merge branch 'ys/bisect-object-id-missing-conversion-fix' into maint (diff) | |
| download | tgif-95308d64ce43502507091ae5bbbdc41a918149ce.tar.xz | |
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 <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/index-pack.c | 1 | ||||
| -rw-r--r-- | builtin/pack-objects.c | 1 | ||||
| -rw-r--r-- | builtin/reflog.c | 1 | ||||
| -rw-r--r-- | builtin/unpack-objects.c | 1 | ||||
| -rw-r--r-- | object.h | 6 |
5 files changed, 9 insertions, 1 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 4c51aec81f..c7f0184c1b 100644 --- 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 index 6b9cfc289d..9c3e69e063 100644 --- 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 index 2233725315..95becf0e7e 100644 --- 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 index 62ea264c46..b2ad6fba2f 100644 --- 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) @@ -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 |