From: Junio C Hamano <gitster@pobox•com>
To: Glen Choo <chooglen@google•com>
Cc: git@vger•kernel.org, "Atharva Raykar" <raykar.ath@gmail•com>,
"Emily Shaffer" <emilyshaffer@google•com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail•com>,
"Josh Steadmon" <steadmon@google•com>
Subject: Re: [PATCH v3 04/13] submodule--helper run-update-procedure: remove --suboid
Date: Thu, 03 Mar 2022 13:09:35 -0800 [thread overview]
Message-ID: <xmqqilsuagkw.fsf@gitster.g> (raw)
In-Reply-To: <20220303005727.69270-5-chooglen@google.com> (Glen Choo's message of "Wed, 2 Mar 2022 16:57:18 -0800")
Glen Choo <chooglen@google•com> writes:
> Teach run-update-procedure to determine the oid of the submodule's HEAD
> instead of doing it in git-subomdule.sh.
subomdule -> submodule.
> @@ -3032,6 +3029,12 @@ static int module_create_branch(int argc, const char **argv, const char *prefix)
> /* NEEDSWORK: this is a temporary name until we delete update_submodule() */
> static int update_submodule2(struct update_data *update_data)
> {
> + if (update_data->just_cloned)
> + oidcpy(&update_data->suboid, null_oid());
> + else if (resolve_gitlink_ref(update_data->sm_path, "HEAD", &update_data->suboid))
> + die(_("Unable to find current revision in submodule path '%s'"),
> + update_data->displaypath);
> +
> if (!oideq(&update_data->oid, &update_data->suboid) || update_data->force)
> return do_run_update_procedure(update_data);
Makes sense.
next prev parent reply other threads:[~2022-03-03 21:09 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-01 0:08 [PATCH 00/13] submodule: convert parts of 'update' to C Glen Choo
2022-03-01 0:08 ` [PATCH 01/13] submodule tests: test for init and update failure output Glen Choo
2022-03-01 0:08 ` [PATCH 02/13] submodule--helper: remove update-module-mode Glen Choo
2022-03-01 0:08 ` [PATCH 03/13] submodule--helper: reorganize code for sh to C conversion Glen Choo
2022-03-01 0:08 ` [PATCH 04/13] submodule--helper run-update-procedure: remove --suboid Glen Choo
2022-03-01 0:08 ` [PATCH 05/13] submodule--helper: remove ensure-core-worktree Glen Choo
2022-03-01 0:08 ` [PATCH 06/13] submodule--helper: get remote names from any repository Glen Choo
2022-03-01 2:46 ` Junio C Hamano
2022-03-01 4:26 ` Glen Choo
2022-03-01 0:08 ` [PATCH 07/13] submodule--helper: don't use bitfield indirection for parse_options() Glen Choo
2022-03-01 0:08 ` [PATCH 08/13] submodule--helper run-update-procedure: learn --remote Glen Choo
2022-03-01 0:08 ` [PATCH 09/13] submodule--helper: refactor get_submodule_displaypath() Glen Choo
2022-03-01 0:08 ` [PATCH 10/13] submodule--helper: allow setting superprefix for init_submodule() Glen Choo
2022-03-01 0:08 ` [PATCH 11/13] submodule--helper update-clone: learn --init Glen Choo
2022-03-01 0:08 ` [PATCH 12/13] submodule update: add tests for --filter Glen Choo
2022-03-01 0:08 ` [PATCH 13/13] submodule--helper update-clone: check for --filter and --init Glen Choo
2022-03-01 1:29 ` [PATCH 00/13] submodule: convert parts of 'update' to C Glen Choo
2022-03-01 4:41 ` [PATCH v2 " Glen Choo
2022-03-01 4:41 ` [PATCH v2 01/13] submodule tests: test for init and update failure output Glen Choo
2022-03-01 4:41 ` [PATCH v2 02/13] submodule--helper: remove update-module-mode Glen Choo
2022-03-01 4:41 ` [PATCH v2 03/13] submodule--helper: reorganize code for sh to C conversion Glen Choo
2022-03-01 4:41 ` [PATCH v2 04/13] submodule--helper run-update-procedure: remove --suboid Glen Choo
2022-03-01 4:41 ` [PATCH v2 05/13] submodule--helper: remove ensure-core-worktree Glen Choo
2022-03-01 4:41 ` [PATCH v2 06/13] submodule--helper: get remote names from any repository Glen Choo
2022-03-01 8:01 ` Ævar Arnfjörð Bjarmason
2022-03-01 4:41 ` [PATCH v2 07/13] submodule--helper: don't use bitfield indirection for parse_options() Glen Choo
2022-03-01 4:41 ` [PATCH v2 08/13] submodule--helper run-update-procedure: learn --remote Glen Choo
2022-03-01 4:41 ` [PATCH v2 09/13] submodule--helper: refactor get_submodule_displaypath() Glen Choo
2022-03-01 8:05 ` Ævar Arnfjörð Bjarmason
2022-03-01 4:41 ` [PATCH v2 10/13] submodule--helper: allow setting superprefix for init_submodule() Glen Choo
2022-03-01 4:41 ` [PATCH v2 11/13] submodule--helper update-clone: learn --init Glen Choo
2022-03-01 4:41 ` [PATCH v2 12/13] submodule update: add tests for --filter Glen Choo
2022-03-01 8:07 ` Ævar Arnfjörð Bjarmason
2022-03-01 18:30 ` Glen Choo
2022-03-01 4:41 ` [PATCH v2 13/13] submodule--helper update-clone: check for --filter and --init Glen Choo
2022-03-01 7:21 ` Ævar Arnfjörð Bjarmason
2022-03-01 7:34 ` Junio C Hamano
2022-03-01 18:34 ` Glen Choo
2022-03-03 10:06 ` Ævar Arnfjörð Bjarmason
2022-03-03 0:57 ` [PATCH v3 00/13] submodule: convert parts of 'update' to C Glen Choo
2022-03-03 0:57 ` [PATCH v3 01/13] submodule tests: test for init and update failure output Glen Choo
2022-03-03 0:57 ` [PATCH v3 02/13] submodule--helper: remove update-module-mode Glen Choo
2022-03-03 0:57 ` [PATCH v3 03/13] submodule--helper: reorganize code for sh to C conversion Glen Choo
2022-03-03 0:57 ` [PATCH v3 04/13] submodule--helper run-update-procedure: remove --suboid Glen Choo
2022-03-03 21:09 ` Junio C Hamano [this message]
2022-03-03 0:57 ` [PATCH v3 05/13] submodule--helper: remove ensure-core-worktree Glen Choo
2022-03-03 21:25 ` Junio C Hamano
2022-03-04 21:27 ` Glen Choo
2022-03-03 0:57 ` [PATCH v3 06/13] submodule--helper: get remote names from any repository Glen Choo
2022-03-03 0:57 ` [PATCH v3 07/13] submodule--helper: don't use bitfield indirection for parse_options() Glen Choo
2022-03-03 0:57 ` [PATCH v3 08/13] submodule--helper run-update-procedure: learn --remote Glen Choo
2022-03-03 21:35 ` Junio C Hamano
2022-03-04 21:29 ` Glen Choo
2022-03-03 0:57 ` [PATCH v3 09/13] submodule--helper: refactor get_submodule_displaypath() Glen Choo
2022-03-03 0:57 ` [PATCH v3 10/13] submodule--helper: allow setting superprefix for init_submodule() Glen Choo
2022-03-03 0:57 ` [PATCH v3 11/13] submodule--helper update-clone: learn --init Glen Choo
2022-03-03 0:57 ` [PATCH v3 12/13] submodule update: add tests for --filter Glen Choo
2022-03-03 0:57 ` [PATCH v3 13/13] submodule--helper update-clone: check for --filter and --init Glen Choo
2022-03-03 9:58 ` [PATCH v3 00/13] submodule: convert parts of 'update' to C Ævar Arnfjörð Bjarmason
2022-03-03 21:41 ` Junio C Hamano
2022-03-05 0:13 ` [PATCH v4 " Glen Choo
2022-03-05 0:13 ` [PATCH v4 01/13] submodule tests: test for init and update failure output Glen Choo
2022-03-05 0:13 ` [PATCH v4 02/13] submodule--helper: remove update-module-mode Glen Choo
2022-03-05 0:13 ` [PATCH v4 03/13] submodule--helper: reorganize code for sh to C conversion Glen Choo
2022-03-05 0:13 ` [PATCH v4 04/13] submodule--helper run-update-procedure: remove --suboid Glen Choo
2022-03-05 0:13 ` [PATCH v4 05/13] submodule--helper: get remote names from any repository Glen Choo
2022-03-05 0:13 ` [PATCH v4 06/13] submodule--helper: don't use bitfield indirection for parse_options() Glen Choo
2022-03-05 0:13 ` [PATCH v4 07/13] submodule--helper run-update-procedure: learn --remote Glen Choo
2022-03-05 0:13 ` [PATCH v4 08/13] submodule--helper: refactor get_submodule_displaypath() Glen Choo
2022-03-05 0:13 ` [PATCH v4 09/13] submodule--helper: allow setting superprefix for init_submodule() Glen Choo
2022-03-05 0:13 ` [PATCH v4 10/13] submodule--helper update-clone: learn --init Glen Choo
2022-03-05 0:13 ` [PATCH v4 11/13] submodule--helper: remove ensure-core-worktree Glen Choo
2022-03-05 0:14 ` [PATCH v4 12/13] submodule update: add tests for --filter Glen Choo
2022-03-05 0:14 ` [PATCH v4 13/13] submodule--helper update-clone: check for --filter and --init Glen Choo
2022-03-05 0:40 ` [PATCH v4 00/13] submodule: convert parts of 'update' to C Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqilsuagkw.fsf@gitster.g \
--to=gitster@pobox$(echo .)com \
--cc=avarab@gmail$(echo .)com \
--cc=chooglen@google$(echo .)com \
--cc=emilyshaffer@google$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=raykar.ath@gmail$(echo .)com \
--cc=steadmon@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox