undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/object-allocation-comments'

Browse Source 
Code doc update.

* nd/object-allocation-comments:
  object.h: realign object flag allocation comment
  object.h: update flag allocation comment
This commit is contained in:
Junio C Hamano 2018-03-14 12:01:06 -07:00
commit 99321e327b
5 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/index-pack.c
View File

@ -49,6 +49,7 @@ struct thread_local {
int pack_fd; int pack_fd;
}; };
/* Remember to update object flag allocation in object.h */
#define FLAG_LINK (1u<<20) #define FLAG_LINK (1u<<20)
#define FLAG_CHECKED (1u<<21) #define FLAG_CHECKED (1u<<21)

1
builtin/pack-objects.c
View File

@ -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) #define OBJECT_ADDED (1u<<20)
static void show_commit(struct commit *commit, void *data) static void show_commit(struct commit *commit, void *data)

1
builtin/reflog.c
View File

@ -52,6 +52,7 @@ struct collect_reflog_cb {
int nr; int nr;
}; };
/* Remember to update object flag allocation in object.h */
#define INCOMPLETE (1u<<10) #define INCOMPLETE (1u<<10)
#define STUDYING (1u<<11) #define STUDYING (1u<<11)
#define REACHABLE (1u<<12) #define REACHABLE (1u<<12)

1
builtin/unpack-objects.c
View File

@ -158,6 +158,7 @@ struct obj_info {
struct object *obj; struct object *obj;
}; };
/* Remember to update object flag allocation in object.h */
#define FLAG_OPEN (1u<<20) #define FLAG_OPEN (1u<<20)
#define FLAG_WRITTEN (1u<<21) #define FLAG_WRITTEN (1u<<21)

28
object.h
View File

@ -28,18 +28,22 @@ struct object_array {
#define TYPE_BITS 3 #define TYPE_BITS 3
/* /*
* object flag allocation: * object flag allocation:
* revision.h: 0---------10 26 * revision.h: 0---------10 26
* fetch-pack.c: 0---5 * fetch-pack.c: 0----5
* walker.c: 0-2 * walker.c: 0-2
* upload-pack.c: 4 11----------------19 * upload-pack.c: 4 11----------------19
* builtin/blame.c: 12-13 * builtin/blame.c: 12-13
* bisect.c: 16 * bisect.c: 16
* bundle.c: 16 * bundle.c: 16
* http-push.c: 16-----19 * http-push.c: 16-----19
* commit.c: 16-----19 * commit.c: 16-----19
* sha1_name.c: 20 * sha1_name.c: 20
* list-objects-filter.c: 21 * list-objects-filter.c: 21
* builtin/fsck.c: 0--3 * 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 #define FLAG_BITS 27