mirror of
https://github.com/git/git.git
synced 2026-01-21 22:37:17 +09:00
last-modified: add option '--max-depth' to help output
In previous commit option '--max-depth' was added to the documentation. To have it also appear in the help output of `git last-modified -h`, move the handling of '--max-depth' to parse_options() in builtin/last-modified.c itself. It enables us to change default behavior in a subsequent commit. Signed-off-by: Toon Claes <toon@iotcl.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
cf3f547bb9
commit
19ccdcd2a5
@ -56,6 +56,7 @@ struct last_modified {
|
||||
bool recursive;
|
||||
bool show_trees;
|
||||
bool null_termination;
|
||||
int max_depth;
|
||||
|
||||
const char **all_paths;
|
||||
size_t all_paths_nr;
|
||||
@ -483,6 +484,12 @@ static int last_modified_init(struct last_modified *lm, struct repository *r,
|
||||
lm->rev.diffopt.flags.recursive = lm->recursive;
|
||||
lm->rev.diffopt.flags.tree_in_recursive = lm->show_trees;
|
||||
|
||||
if (lm->max_depth >= 0) {
|
||||
lm->rev.diffopt.flags.recursive = 1;
|
||||
lm->rev.diffopt.max_depth = lm->max_depth;
|
||||
lm->rev.diffopt.max_depth_valid = 1;
|
||||
}
|
||||
|
||||
argc = setup_revisions(argc, argv, &lm->rev, NULL);
|
||||
if (argc > 1) {
|
||||
error(_("unknown last-modified argument: %s"), argv[1]);
|
||||
@ -521,11 +528,19 @@ int cmd_last_modified(int argc, const char **argv, const char *prefix,
|
||||
N_("recurse into subtrees")),
|
||||
OPT_BOOL('t', "show-trees", &lm.show_trees,
|
||||
N_("show tree entries when recursing into subtrees")),
|
||||
OPT_INTEGER_F(0, "max-depth", &lm.max_depth,
|
||||
N_("maximum tree depth to recurse"), PARSE_OPT_NONEG),
|
||||
OPT_BOOL('z', NULL, &lm.null_termination,
|
||||
N_("lines are separated with NUL character")),
|
||||
OPT_END()
|
||||
};
|
||||
|
||||
/*
|
||||
* Set the default of a max-depth to "unset". This will change in a
|
||||
* subsequent commit.
|
||||
*/
|
||||
lm.max_depth = -1;
|
||||
|
||||
argc = parse_options(argc, argv, prefix, last_modified_options,
|
||||
last_modified_usage,
|
||||
PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN_OPT);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user