Skip to content

Commit 72263ff

Browse files
ttaylorrgitster
authored andcommitted
builtin/repack.c: use named flags for existing_packs
We use the `util` pointer for items in the `existing_packs` string list to indicate which packs are going to be deleted. Since that has so far been the only use of that `util` pointer, we just set it to 0 or 1. But we're going to add an additional state to this field in the next patch, so prepare for that by adding a #define for the first bit so we can more expressively inspect the flags state. Signed-off-by: Taylor Blau <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4571324 commit 72263ff

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

builtin/repack.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
#define LOOSEN_UNREACHABLE 2
2323
#define PACK_CRUFT 4
2424

25+
#define DELETE_PACK 1
26+
2527
static int pack_everything;
2628
static int delta_base_offset = 1;
2729
static int pack_kept_objects = -1;
@@ -564,7 +566,7 @@ static void midx_included_packs(struct string_list *include,
564566
}
565567
} else {
566568
for_each_string_list_item(item, existing_nonkept_packs) {
567-
if (item->util)
569+
if ((uintptr_t)item->util & DELETE_PACK)
568570
continue;
569571
string_list_insert(include, xstrfmt("%s.idx", item->string));
570572
}
@@ -1002,7 +1004,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
10021004
* was given) and that we will actually delete this pack
10031005
* (if `-d` was given).
10041006
*/
1005-
item->util = (void*)(intptr_t)!string_list_has_string(&names, sha1);
1007+
if (!string_list_has_string(&names, sha1))
1008+
item->util = (void*)(uintptr_t)((size_t)item->util | DELETE_PACK);
10061009
}
10071010
}
10081011

@@ -1026,7 +1029,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
10261029
if (delete_redundant) {
10271030
int opts = 0;
10281031
for_each_string_list_item(item, &existing_nonkept_packs) {
1029-
if (!item->util)
1032+
if (!((uintptr_t)item->util & DELETE_PACK))
10301033
continue;
10311034
remove_redundant_pack(packdir, item->string);
10321035
}

0 commit comments

Comments
 (0)