Skip to content

Commit 480e785

Browse files
committed
Merge branch 'rs/pack-bits-in-object-better'
By renumbering object flag bits, "struct object" managed to lose bloated inter-field padding. * rs/pack-bits-in-object-better: revision: reallocate TOPO_WALK object flags
2 parents 67d99b8 + 23c4319 commit 480e785

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

object.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ struct object_array {
5858

5959
/*
6060
* object flag allocation:
61-
* revision.h: 0---------10 15 25----28
61+
* revision.h: 0---------10 15 23------26
6262
* fetch-pack.c: 01
6363
* negotiator/default.c: 2--5
6464
* walker.c: 0-2
@@ -78,7 +78,7 @@ struct object_array {
7878
* builtin/show-branch.c: 0-------------------------------------------26
7979
* builtin/unpack-objects.c: 2021
8080
*/
81-
#define FLAG_BITS 29
81+
#define FLAG_BITS 28
8282

8383
/*
8484
* The object type is stored in 3 bits.

revision.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737

3838
/* WARNING: This is also used as REACHABLE in commit-graph.c. */
3939
#define PULL_MERGE (1u<<15)
40+
41+
#define TOPO_WALK_EXPLORED (1u<<23)
42+
#define TOPO_WALK_INDEGREE (1u<<24)
43+
4044
/*
4145
* Indicates object was reached by traversal. i.e. not given by user on
4246
* command-line or stdin.
@@ -48,9 +52,6 @@
4852
#define TRACK_LINEAR (1u<<26)
4953
#define ALL_REV_FLAGS (((1u<<11)-1) | NOT_USER_GIVEN | TRACK_LINEAR | PULL_MERGE)
5054

51-
#define TOPO_WALK_EXPLORED (1u<<27)
52-
#define TOPO_WALK_INDEGREE (1u<<28)
53-
5455
#define DECORATE_SHORT_REFS 1
5556
#define DECORATE_FULL_REFS 2
5657

0 commit comments

Comments
 (0)