Merge branch 'os/collect-changed-submodules-optim'
Optimization around submodule handling. * os/collect-changed-submodules-optim: submodule: suppress checking for file name and ref ambiguity for object idsmaint
commit
2ce9d4e5c7
|
@ -840,9 +840,16 @@ static void collect_changed_submodules(struct repository *r,
|
||||||
{
|
{
|
||||||
struct rev_info rev;
|
struct rev_info rev;
|
||||||
const struct commit *commit;
|
const struct commit *commit;
|
||||||
|
int save_warning;
|
||||||
|
struct setup_revision_opt s_r_opt = {
|
||||||
|
.assume_dashdash = 1,
|
||||||
|
};
|
||||||
|
|
||||||
|
save_warning = warn_on_object_refname_ambiguity;
|
||||||
|
warn_on_object_refname_ambiguity = 0;
|
||||||
repo_init_revisions(r, &rev, NULL);
|
repo_init_revisions(r, &rev, NULL);
|
||||||
setup_revisions(argv->nr, argv->v, &rev, NULL);
|
setup_revisions(argv->nr, argv->v, &rev, &s_r_opt);
|
||||||
|
warn_on_object_refname_ambiguity = save_warning;
|
||||||
if (prepare_revision_walk(&rev))
|
if (prepare_revision_walk(&rev))
|
||||||
die(_("revision walk setup failed"));
|
die(_("revision walk setup failed"));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue