"Orgad Shaneh via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > From: Orgad Shaneh <orgads@xxxxxxxxx> > > The argv argument of collect_changed_submodules() contains obly object ids obly??? s/b/n/. > (the objects references of all the refs). > > Notify setup_revisions() that the input is not filenames by passing > assume_dashdash, so it can avoid redundant stat for each ref. > > A better improvement would be to pass oid_array instead of stringified argv, > but that will require a larger change, which can be done later. A naïve way is to append "--" to the argv strvec, but since 6d5b93f2 (cherry-pick: do not expect file arguments, 2012-04-14) we made it unnecessary by introducing the flag. This is exactly how the flag was designed to be used. Good job. Thanks. > > Signed-off-by: Orgad Shaneh <orgads@xxxxxxxxx> > --- > submodule: suppress checking for file name ambiguity for object ids > > The argv argument of collect_changed_submodules() contains obly object > ids (submodule references). > > Notify setup_revisions() that the input is not filenames by passing > assume_dashdash, so it can avoid redundant stat for each ref. > > A better improvement would be to pass oid_array instead of stringified > argv, but that will require a larger change, which can be done later. > > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-725%2Forgads%2Fsubmodule-not-filename-v2 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-725/orgads/submodule-not-filename-v2 > Pull-Request: https://github.com/gitgitgadget/git/pull/725 > > Range-diff vs v1: > > 1: f12112cc88 ! 1: 501ce90e9a submodule: suppress checking for file name ambiguity for object ids > @@ Commit message > submodule: suppress checking for file name ambiguity for object ids > > The argv argument of collect_changed_submodules() contains obly object ids > - (submodule references). > + (the objects references of all the refs). > > Notify setup_revisions() that the input is not filenames by passing > assume_dashdash, so it can avoid redundant stat for each ref. > > > submodule.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/submodule.c b/submodule.c > index 3cbcf40dfc..9b5bfb12a3 100644 > --- a/submodule.c > +++ b/submodule.c > @@ -840,9 +840,12 @@ static void collect_changed_submodules(struct repository *r, > { > struct rev_info rev; > const struct commit *commit; > + struct setup_revision_opt s_r_opt = { > + .assume_dashdash = 1, > + }; > > repo_init_revisions(r, &rev, NULL); > - setup_revisions(argv->nr, argv->v, &rev, NULL); > + setup_revisions(argv->nr, argv->v, &rev, &s_r_opt); > if (prepare_revision_walk(&rev)) > die(_("revision walk setup failed")); > > > base-commit: 3a238e539bcdfe3f9eb5010fd218640c1b499f7a
