Skip to content

Commit 2ce9d4e

Browse files
committed
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 ids
2 parents 45f462b + a462bee commit 2ce9d4e

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

submodule.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,9 +840,16 @@ static void collect_changed_submodules(struct repository *r,
840840
{
841841
struct rev_info rev;
842842
const struct commit *commit;
843+
int save_warning;
844+
struct setup_revision_opt s_r_opt = {
845+
.assume_dashdash = 1,
846+
};
843847

848+
save_warning = warn_on_object_refname_ambiguity;
849+
warn_on_object_refname_ambiguity = 0;
844850
repo_init_revisions(r, &rev, NULL);
845-
setup_revisions(argv->nr, argv->v, &rev, NULL);
851+
setup_revisions(argv->nr, argv->v, &rev, &s_r_opt);
852+
warn_on_object_refname_ambiguity = save_warning;
846853
if (prepare_revision_walk(&rev))
847854
die(_("revision walk setup failed"));
848855

0 commit comments

Comments
 (0)