diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-14 19:01:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 19:01:06 (GMT) |
| commit | 99321e327b4df8d9d6724cf26bab7429edbdb718 (patch) | |
| tree | 634f157cdbf88c274d9321dafb8de6d67e4b3781 /builtin | |
| parent | 88506cb887254b5950fe330cc720e94a6058d239 (diff) | |
| parent | 3d1cf1e8e1552ae82178bb52953772495f5fd326 (diff) | |
| download | git-99321e327b4df8d9d6724cf26bab7429edbdb718.zip git-99321e327b4df8d9d6724cf26bab7429edbdb718.tar.gz git-99321e327b4df8d9d6724cf26bab7429edbdb718.tar.bz2 | |
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
Diffstat (limited to 'builtin')
| -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 |
4 files changed, 4 insertions, 0 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 59878e7..9791d42 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 a197926..e9d3cfb 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -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) diff --git a/builtin/reflog.c b/builtin/reflog.c index ac3dcd7..4719a53 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 9f96949..6620fee 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) |