refs: remove `PACK_REFS_ALL` flag

The intent of the `PACK_REFS_ALL` flag is to ask the backend to compact
all refs instead of only a subset of them. Thus, this flag gets passed
down to `refs_pack_refs()` via `struct pack_refs_opts::flags`.

But starting with 4fe42f326e (pack-refs: teach pack-refs --include
option, 2023-05-12), the flag's semantics have changed. Instead of being
handled by the respective backends, this flag is now getting handled by
the callers of `refs_pack_refs()` which will add a single glob ("*") to
the list of refs-to-be-packed. Thus, the flag serves no purpose to the
ref backends anymore.

Remove the flag and replace it with a local variable.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/pack-refs.c b/builtin/pack-refs.c
index bcf383cac9dd875354d3c91152f7b8d635f82ff4..97921beef216dcbe93a1cb10f67cd4a4111d03cb 100644 (file)
--- a/builtin/pack-refs.c
+++ b/builtin/pack-refs.c
@@ -21,9 +21,10 @@ int cmd_pack_refs(int argc, const char **argv, const char *prefix)
                                                 .flags = flags };
        static struct string_list option_excluded_refs = STRING_LIST_INIT_NODUP;
        struct string_list_item *item;
+       int pack_all = 0;
 
        struct option opts[] = {
-               OPT_BIT(0, "all",   &pack_refs_opts.flags, N_("pack everything"), PACK_REFS_ALL),
+               OPT_BOOL(0, "all",   &pack_all, N_("pack everything")),
                OPT_BIT(0, "prune", &pack_refs_opts.flags, N_("prune loose refs (default)"), PACK_REFS_PRUNE),
                OPT_STRING_LIST(0, "include", pack_refs_opts.includes, N_("pattern"),
                        N_("references to include")),
@@ -38,7 +39,7 @@ int cmd_pack_refs(int argc, const char **argv, const char *prefix)
        for_each_string_list_item(item, &option_excluded_refs)
                add_ref_exclusion(pack_refs_opts.exclusions, item->string);
 
-       if (pack_refs_opts.flags & PACK_REFS_ALL)
+       if (pack_all)
                string_list_append(pack_refs_opts.includes, "*");
 
        if (!pack_refs_opts.includes->nr)

diff --git a/refs.h b/refs.h
index 139ce7113bd865ad7689209f74d74cfcbc76c96e..8c8994cb297ce9d93a828c6501bf886290d508c3 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -422,10 +422,8 @@ void warn_dangling_symrefs(FILE *fp, const char *msg_fmt,
 /*
  * Flags for controlling behaviour of pack_refs()
  * PACK_REFS_PRUNE: Prune loose refs after packing
- * PACK_REFS_ALL:   Pack _all_ refs, not just tags and already packed refs
  */
 #define PACK_REFS_PRUNE 0x0001
-#define PACK_REFS_ALL   0x0002
 
 struct pack_refs_opts {
        unsigned int flags;