From: Jonathan Tan <jonathantanmy@google.com>
To: Glen Choo via GitGitGadget <gitgitgadget@gmail.com>
Cc: Jonathan Tan <jonathantanmy@google.com>,
git@vger.kernel.org,
Philippe Blain <levraiphilippeblain@gmail.com>,
Glen Choo <chooglen@google.com>
Subject: Re: [PATCH v3 7/8] submodule--helper: remove update_data.suboid
Date: Mon, 14 Nov 2022 15:45:54 -0800 [thread overview]
Message-ID: <20221114234555.19060-1-jonathantanmy@google.com> (raw)
In-Reply-To: <4e402b67145c6e33c13826f1daf1883a66cd9cd4.1666988096.git.gitgitgadget@gmail.com>
Rearranging the diffs...
"Glen Choo via GitGitGadget" <gitgitgadget@gmail.com> writes:
> @@ -2532,10 +2532,8 @@ static int update_submodule(struct update_data *update_data)
> if (ret)
> return ret;
>
> - if (update_data->just_cloned)
> - oidcpy(&update_data->suboid, null_oid());
> - else if (resolve_gitlink_ref(update_data->sm_path, "HEAD",
> - &update_data->suboid, NULL))
> + if (!update_data->just_cloned &&
> + resolve_gitlink_ref(update_data->sm_path, "HEAD", &suboid, NULL))
> return die_message(_("Unable to find current revision in submodule path '%s'"),
> update_data->displaypath);
>
Here, we only set suboid if !update_data->just_cloned...
> @@ -2570,7 +2568,8 @@ static int update_submodule(struct update_data *update_data)
> free(remote_ref);
> }
>
> - submodule_up_to_date = oideq(&update_data->oid, &update_data->suboid);
> + submodule_up_to_date = !update_data->just_cloned &&
> + oideq(&update_data->oid, &suboid);
> if (!submodule_up_to_date || update_data->force) {
> ret = run_update_procedure(update_data);
> if (ret)
...and here, we read suboid if !update_data->just_cloned.
> @@ -2523,6 +2522,7 @@ static int update_submodule(struct update_data *update_data)
> {
> int submodule_up_to_date;
> int ret;
> + struct object_id suboid;
And here we declare it with no initializer. This is safe for now since we only
read it when !update_data->just_cloned, which is also the condition for setting
it, but may be error-prone in the future. Probably best to initialize it to
something.
Other than that everything looks good up to and including this patch. This is
definitely an improvement over using a null OID to signal something, so thanks.
next prev parent reply other threads:[~2022-11-14 23:46 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-29 20:54 [PATCH 0/6] clone, submodule update: check out submodule branches Glen Choo via GitGitGadget
2022-08-29 20:54 ` [PATCH 1/6] clone: teach --detach option Glen Choo via GitGitGadget
2022-08-30 4:02 ` Philippe Blain
2022-08-29 20:54 ` [PATCH 2/6] repo-settings: add submodule_propagate_branches Glen Choo via GitGitGadget
2022-08-30 4:02 ` Philippe Blain
2022-08-29 20:54 ` [PATCH 3/6] t5617: drop references to remote-tracking branches Glen Choo via GitGitGadget
2022-08-30 4:03 ` Philippe Blain
2022-08-29 20:54 ` [PATCH 4/6] submodule: return target of submodule symref Glen Choo via GitGitGadget
2022-09-01 20:01 ` Jonathan Tan
2022-09-01 20:46 ` Glen Choo
2022-08-29 20:54 ` [PATCH 5/6] submodule--helper: refactor up-to-date criterion Glen Choo via GitGitGadget
2022-08-29 20:54 ` [PATCH 6/6] clone, submodule update: check out branches Glen Choo via GitGitGadget
2022-08-30 4:03 ` Philippe Blain
2022-08-30 22:54 ` Glen Choo
2022-09-01 20:00 ` Jonathan Tan
2022-10-20 20:20 ` [PATCH v2 0/7] clone, submodule update: check out submodule branches Glen Choo via GitGitGadget
2022-10-20 20:20 ` [PATCH v2 1/7] clone: teach --detach option Glen Choo via GitGitGadget
2022-10-20 20:20 ` [PATCH v2 2/7] repo-settings: add submodule_propagate_branches Glen Choo via GitGitGadget
2022-10-25 18:03 ` Jonathan Tan
2022-10-20 20:20 ` [PATCH v2 3/7] submodule--helper clone: create named branch Glen Choo via GitGitGadget
2022-10-25 18:00 ` Jonathan Tan
2022-10-20 20:20 ` [PATCH v2 4/7] t5617: drop references to remote-tracking branches Glen Choo via GitGitGadget
2022-10-20 20:20 ` [PATCH v2 5/7] submodule: return target of submodule symref Glen Choo via GitGitGadget
2022-10-20 20:20 ` [PATCH v2 6/7] submodule update: refactor update targets Glen Choo via GitGitGadget
2022-10-20 20:20 ` [PATCH v2 7/7] clone, submodule update: create and check out branches Glen Choo via GitGitGadget
2022-10-25 17:56 ` Jonathan Tan
2022-10-25 21:49 ` Glen Choo
2022-10-20 22:40 ` [PATCH v2 0/7] clone, submodule update: check out submodule branches Junio C Hamano
2022-10-20 23:53 ` Glen Choo
2022-10-21 0:01 ` Junio C Hamano
2022-10-28 20:14 ` [PATCH v3 0/8] " Glen Choo via GitGitGadget
2022-10-28 20:14 ` [PATCH v3 1/8] clone: teach --detach option Glen Choo via GitGitGadget
2022-10-28 21:40 ` Junio C Hamano
2022-10-28 21:54 ` Junio C Hamano
2022-10-28 22:55 ` Glen Choo
2022-10-30 18:14 ` Taylor Blau
2022-10-31 17:07 ` Glen Choo
2022-11-08 13:32 ` Philippe Blain
2022-10-28 20:14 ` [PATCH v3 2/8] repo-settings: add submodule_propagate_branches Glen Choo via GitGitGadget
2022-10-28 20:14 ` [PATCH v3 3/8] submodule--helper clone: create named branch Glen Choo via GitGitGadget
2022-10-28 20:14 ` [PATCH v3 4/8] t5617: drop references to remote-tracking branches Glen Choo via GitGitGadget
2022-10-28 20:14 ` [PATCH v3 5/8] submodule: return target of submodule symref Glen Choo via GitGitGadget
2022-10-28 21:49 ` Junio C Hamano
2022-10-28 23:11 ` Glen Choo
2022-10-28 20:14 ` [PATCH v3 6/8] submodule update: refactor update targets Glen Choo via GitGitGadget
2022-10-28 20:14 ` [PATCH v3 7/8] submodule--helper: remove update_data.suboid Glen Choo via GitGitGadget
2022-11-14 23:45 ` Jonathan Tan [this message]
2022-10-28 20:14 ` [PATCH v3 8/8] clone, submodule update: create and check out branches Glen Choo via GitGitGadget
2022-11-08 13:53 ` Philippe Blain
2022-11-15 18:15 ` Jonathan Tan
2022-11-22 18:44 ` Glen Choo
2022-11-23 1:33 ` Jonathan Tan
2022-11-23 4:00 ` Junio C Hamano
2022-10-30 18:19 ` [PATCH v3 0/8] clone, submodule update: check out submodule branches Taylor Blau
2022-11-08 14:23 ` Philippe Blain
2022-11-08 20:43 ` Glen Choo
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221114234555.19060-1-jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=chooglen@google.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=levraiphilippeblain@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).