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

revision.c: put promisor option in specialized struct

Browse Source 
Put the allow_exclude_promisor_objects flag in setup_revision_opt. When
it was in rev_info, it was unclear when it was used, since rev_info is
passed to functions that don't use the flag. This resulted in
unnecessary setting of the flag in prune.c, so fix that as well.

Signed-off-by: Matthew DeVore <matvore@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthew DeVore 2018-12-03 14:10:19 -08:00 committed by Junio C Hamano
parent 669b1d2aae
commit bbcde41a70
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/pack-objects.c
View File

@ -2848,13 +2848,15 @@ static void record_recent_commit(struct commit *commit, void *data)
static void get_object_list(int ac, const char **av) static void get_object_list(int ac, const char **av)
{ {
struct rev_info revs; struct rev_info revs;
struct setup_revision_opt s_r_opt = {
.allow_exclude_promisor_objects = 1,
};
char line[1000]; char line[1000];
int flags = 0; int flags = 0;
init_revisions(&revs, NULL); init_revisions(&revs, NULL);
save_commit_buffer = 0; save_commit_buffer = 0;
revs.allow_exclude_promisor_objects_opt = 1; setup_revisions(ac, av, &revs, &s_r_opt);
setup_revisions(ac, av, &revs, NULL);
/* make sure shallows are read */ /* make sure shallows are read */
is_repository_shallow(); is_repository_shallow();

1
builtin/prune.c
View File

@ -118,7 +118,6 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
save_commit_buffer = 0; save_commit_buffer = 0;
check_replace_refs = 0; check_replace_refs = 0;
ref_paranoia = 1; ref_paranoia = 1;
revs.allow_exclude_promisor_objects_opt = 1;
init_revisions(&revs, prefix); init_revisions(&revs, prefix);
argc = parse_options(argc, argv, prefix, options, prune_usage, 0); argc = parse_options(argc, argv, prefix, options, prune_usage, 0);

6
builtin/rev-list.c
View File

@ -357,6 +357,9 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
{ {
struct rev_info revs; struct rev_info revs;
struct rev_list_info info; struct rev_list_info info;
struct setup_revision_opt s_r_opt = {
.allow_exclude_promisor_objects = 1,
};
int i; int i;
int bisect_list = 0; int bisect_list = 0;
int bisect_show_vars = 0; int bisect_show_vars = 0;
@ -370,7 +373,6 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
git_config(git_default_config, NULL); git_config(git_default_config, NULL);
init_revisions(&revs, prefix); init_revisions(&revs, prefix);
revs.abbrev = DEFAULT_ABBREV; revs.abbrev = DEFAULT_ABBREV;
revs.allow_exclude_promisor_objects_opt = 1;
revs.commit_format = CMIT_FMT_UNSPECIFIED; revs.commit_format = CMIT_FMT_UNSPECIFIED;
/* /*
@ -401,7 +403,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
} }
} }
argc = setup_revisions(argc, argv, &revs, NULL); argc = setup_revisions(argc, argv, &revs, &s_r_opt);
memset(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
info.revs = &revs; info.revs = &revs;

10
revision.c
View File

@ -1746,7 +1746,8 @@ static void add_message_grep(struct rev_info *revs, const char *pattern)
} }
static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv, static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
int *unkc, const char **unkv) int *unkc, const char **unkv,
const struct setup_revision_opt* opt)
{ {
const char *arg = argv[0]; const char *arg = argv[0];
const char *optarg; const char *optarg;
@ -2105,7 +2106,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->limited = 1; revs->limited = 1;
} else if (!strcmp(arg, "--ignore-missing")) { } else if (!strcmp(arg, "--ignore-missing")) {
revs->ignore_missing = 1; revs->ignore_missing = 1;
} else if (revs->allow_exclude_promisor_objects_opt && } else if (opt && opt->allow_exclude_promisor_objects &&
!strcmp(arg, "--exclude-promisor-objects")) { !strcmp(arg, "--exclude-promisor-objects")) {
if (fetch_if_missing) if (fetch_if_missing)
die("BUG: exclude_promisor_objects can only be used when fetch_if_missing is 0"); die("BUG: exclude_promisor_objects can only be used when fetch_if_missing is 0");
@ -2127,7 +2128,7 @@ void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
const char * const usagestr[]) const char * const usagestr[])
{ {
int n = handle_revision_opt(revs, ctx->argc, ctx->argv, int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
&ctx->cpidx, ctx->out); &ctx->cpidx, ctx->out, NULL);
if (n <= 0) { if (n <= 0) {
error("unknown option `%s'", ctx->argv[0]); error("unknown option `%s'", ctx->argv[0]);
usage_with_options(usagestr, options); usage_with_options(usagestr, options);
@ -2346,7 +2347,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
continue; continue;
} }
opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv); opts = handle_revision_opt(revs, argc - i, argv + i,
&left, argv, opt);
if (opts > 0) { if (opts > 0) {
i += opts - 1; i += opts - 1;
continue; continue;

4
revision.h
View File

@ -124,7 +124,6 @@ struct rev_info {
tree_blobs_in_commit_order:1, tree_blobs_in_commit_order:1,
/* for internal use only */ /* for internal use only */
allow_exclude_promisor_objects_opt:1,
exclude_promisor_objects:1; exclude_promisor_objects:1;
/* Diff flags */ /* Diff flags */
@ -245,7 +244,8 @@ struct setup_revision_opt {
const char *def; const char *def;
void (*tweak)(struct rev_info *, struct setup_revision_opt *); void (*tweak)(struct rev_info *, struct setup_revision_opt *);
const char *submodule; const char *submodule;
int assume_dashdash; unsigned int assume_dashdash:1,
allow_exclude_promisor_objects:1;
unsigned revarg_opt; unsigned revarg_opt;
}; };