mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/pack-objects-parseopt-fix'

Browse Source 
Command line parser fix.

* rs/pack-objects-parseopt-fix:
  pack-objects: fix --no-quiet
  pack-objects: fix --no-keep-true-parents
This commit is contained in:
Junio C Hamano
2023-07-28 09:45:22 -07:00
parent 3085f949bf 36f76d2a25
commit ddcb8fd8b9
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
builtin/pack-objects.c
View File

@ -4117,6 +4117,18 @@ static void add_extra_kept_packs(const struct string_list *names)
} }
} }
static int option_parse_quiet(const struct option *opt, const char *arg,
int unset)
{
BUG_ON_OPT_ARG(arg);
if (!unset)
progress = 0;
else if (!progress)
progress = 1;
return 0;
}
static int option_parse_index_version(const struct option *opt, static int option_parse_index_version(const struct option *opt,
const char *arg, int unset) const char *arg, int unset)
{ {
@ -4178,8 +4190,9 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
LIST_OBJECTS_FILTER_INIT; LIST_OBJECTS_FILTER_INIT;
struct option pack_objects_options[] = { struct option pack_objects_options[] = {
OPT_SET_INT('q', "quiet", &progress, OPT_CALLBACK_F('q', "quiet", NULL, NULL,
N_("do not show progress meter"), 0), N_("do not show progress meter"),
PARSE_OPT_NOARG, option_parse_quiet),
OPT_SET_INT(0, "progress", &progress, OPT_SET_INT(0, "progress", &progress,
N_("show progress meter"), 1), N_("show progress meter"), 1),
OPT_SET_INT(0, "all-progress", &progress, OPT_SET_INT(0, "all-progress", &progress,
@ -4255,8 +4268,8 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
N_("ignore this pack")), N_("ignore this pack")),
OPT_INTEGER(0, "compression", &pack_compression_level, OPT_INTEGER(0, "compression", &pack_compression_level,
N_("pack compression level")), N_("pack compression level")),
OPT_SET_INT(0, "keep-true-parents", &grafts_replace_parents, OPT_BOOL(0, "keep-true-parents", &grafts_keep_true_parents,
N_("do not hide commits by grafts"), 0), N_("do not hide commits by grafts")),
OPT_BOOL(0, "use-bitmap-index", &use_bitmap_index, OPT_BOOL(0, "use-bitmap-index", &use_bitmap_index,
N_("use a bitmap index if available to speed up counting objects")), N_("use a bitmap index if available to speed up counting objects")),
OPT_SET_INT(0, "write-bitmap-index", &write_bitmap_index, OPT_SET_INT(0, "write-bitmap-index", &write_bitmap_index,

2
commit.c
View File

@ -516,7 +516,7 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b
* The clone is shallow if nr_parent < 0, and we must * The clone is shallow if nr_parent < 0, and we must
* not traverse its real parents even when we unhide them. * not traverse its real parents even when we unhide them.
*/ */
if (graft && (graft->nr_parent < 0 || grafts_replace_parents)) if (graft && (graft->nr_parent < 0 || !grafts_keep_true_parents))
continue; continue;
new_parent = lookup_commit(r, &parent); new_parent = lookup_commit(r, &parent);
if (!new_parent) if (!new_parent)

2
environment.c
View File

@ -73,7 +73,7 @@ enum push_default_type push_default = PUSH_DEFAULT_UNSPECIFIED;
#endif #endif
enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE; enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE;
char *notes_ref_name; char *notes_ref_name;
int grafts_replace_parents = 1; int grafts_keep_true_parents;
int core_apply_sparse_checkout; int core_apply_sparse_checkout;
int core_sparse_checkout_cone; int core_sparse_checkout_cone;
int sparse_expect_files_outside_of_patterns; int sparse_expect_files_outside_of_patterns;

2
environment.h
View File

@ -193,7 +193,7 @@ extern enum object_creation_mode object_creation_mode;
extern char *notes_ref_name; extern char *notes_ref_name;
extern int grafts_replace_parents; extern int grafts_keep_true_parents;
extern int repository_format_precious_objects; extern int repository_format_precious_objects;