Merge branch 'os/collect-changed-submodules-optim'

[thirdparty/git.git] / submodule.c

diff --git a/submodule.c b/submodule.c
index 6f8002fc9e2e33d650a5a3792b1faf48b4a969bf..b84438b7e09dd214d09a2254a93179825f7d737a 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -840,9 +840,16 @@ static void collect_changed_submodules(struct repository *r,
 {
        struct rev_info rev;
        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);
-       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))
                die(_("revision walk setup failed"));