ls-files: support --recurse-submodules --stage
e77aa336f1
("ls-files: optionally recurse into submodules", 2016-10-10) taught ls-files the --recurse-submodules argument, but only in a limited set of circumstances. In particular, --stage was unsupported, perhaps because there was no repo_find_unique_abbrev(), which was only introduced in8bb95572b0
("sha1-name.c: add repo_find_unique_abbrev_r()", 2019-04-16). This function is needed for using --recurse-submodules with --stage. Now that we have repo_find_unique_abbrev(), teach support for this combination of arguments. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
e6ebfd0e8c
commit
290eada0ac
@ -244,7 +244,7 @@ static void show_ce(struct repository *repo, struct dir_struct *dir,
|
||||
printf("%s%06o %s %d\t",
|
||||
tag,
|
||||
ce->ce_mode,
|
||||
find_unique_abbrev(&ce->oid, abbrev),
|
||||
repo_find_unique_abbrev(repo, &ce->oid, abbrev),
|
||||
ce_stage(ce));
|
||||
}
|
||||
write_eolinfo(repo->index, ce, fullname);
|
||||
@ -726,7 +726,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
|
||||
setup_work_tree();
|
||||
|
||||
if (recurse_submodules &&
|
||||
(show_stage || show_deleted || show_others || show_unmerged ||
|
||||
(show_deleted || show_others || show_unmerged ||
|
||||
show_killed || show_modified || show_resolve_undo || with_tree))
|
||||
die("ls-files --recurse-submodules unsupported mode");
|
||||
|
||||
|
Reference in New Issue
Block a user