Core: Submodule commit hashes in main repo do not match the commits in the submodule repositories #100882

New Issue

Falk David · 2022-09-07T18:32:28+02:00

Falk David commented

2022-09-07 18:32:28 +02:00

For example, looking at blender-v3.2-release:

$ git checkout blender-v3.2-release && git pull --rebase origin
$ git submodule foreach git checkout blender-v3.2-release && git submodule foreach git pull --rebase origin
$ git submodule status
 71e0f87dd1ba4e0ed5f619b031045a428e534230 release/datafiles/locale (v3.2.2)
+9c39b79cdcadf7ea700c92bc4f641138a6ff03e1 release/scripts/addons (v3.2.2)
+61e45814503f51963c91c51aaf764612e7c5dc72 release/scripts/addons_contrib (v3.2.2)
+b41c89a8a7e19096a1b5cd3e83ff41258ebaf60d source/tools (v3.2.2)
$ git ls-tree HEAD release/scripts/addons [...]
160000 commit 71e0f87dd1ba4e0ed5f619b031045a428e534230  release/datafiles/locale
160000 commit bcb71eea69a7b83c44112a5872ccd67cae96ec6f  release/scripts/addons
160000 commit 61efd17f87b45c3049091127a5619219f9d2a821  release/scripts/addons_contrib
160000 commit ccc8fceb6bd83ffbf6e5207247fb8f76fc47a5b6  source/tools

As we can see the hashes for release/scripts/addons, release/scripts/addons_contrib and source/tools do not match.
The same problem applies to blender-v3.3-release (and probably more that I have not checked).

Here is an example of a commit that changed the hash for release/scripts/addons/ for no apparent reason: 000312ab51.
Another more recent example: 65ad36f5fd.

This is an issue, especially when not relying on make_update.py. For example git submodule update will not work as expected, since it will use the hash from the main repo to update the submodule.

For example, looking at `blender-v3.2-release`: ``` $ git checkout blender-v3.2-release && git pull --rebase origin $ git submodule foreach git checkout blender-v3.2-release && git submodule foreach git pull --rebase origin $ git submodule status 71e0f87dd1ba4e0ed5f619b031045a428e534230 release/datafiles/locale (v3.2.2) +9c39b79cdcadf7ea700c92bc4f641138a6ff03e1 release/scripts/addons (v3.2.2) +61e45814503f51963c91c51aaf764612e7c5dc72 release/scripts/addons_contrib (v3.2.2) +b41c89a8a7e19096a1b5cd3e83ff41258ebaf60d source/tools (v3.2.2) $ git ls-tree HEAD release/scripts/addons [...] 160000 commit 71e0f87dd1ba4e0ed5f619b031045a428e534230 release/datafiles/locale 160000 commit bcb71eea69a7b83c44112a5872ccd67cae96ec6f release/scripts/addons 160000 commit 61efd17f87b45c3049091127a5619219f9d2a821 release/scripts/addons_contrib 160000 commit ccc8fceb6bd83ffbf6e5207247fb8f76fc47a5b6 source/tools ``` As we can see the hashes for `release/scripts/addons`, `release/scripts/addons_contrib` and `source/tools` do not match. The same problem applies to `blender-v3.3-release` (and probably more that I have not checked). Here is an example of a commit that changed the hash for `release/scripts/addons/` for no apparent reason: 000312ab51. Another more recent example: 65ad36f5fd. This is an issue, especially when not relying on `make_update.py`. For example `git submodule update` will not work as expected, since it will use the hash from the main repo to update the submodule.

Falk David commented

2022-09-07 18:32:28 +02:00

Added subscriber: @filedescriptor

Luca Rood commented

2022-09-07 19:10:58 +02:00

Added subscriber: @LucaRood-3

Brecht Van Lommel commented

2022-09-07 19:17:14 +02:00

Added subscribers: @ThomasDinges, @Sergey, @brecht

Brecht Van Lommel commented

2022-09-07 19:17:14 +02:00

We have to clarify this in the release checklist. I believe should first tag the submodule repositories, then make a commit in the Blender repository that references the corresponding submodule hashes, and then tag the Blender repository including that commit.

Probably we should also commit updated submodule hashes in master at least once per release cycle, so they don't lag arbitrarily far behind.

We have to clarify this in the release checklist. I believe should first tag the submodule repositories, then make a commit in the Blender repository that references the corresponding submodule hashes, and then tag the Blender repository including that commit. Probably we should also commit updated submodule hashes in master at least once per release cycle, so they don't lag arbitrarily far behind.

Sergey Sharybin commented

2022-09-07 19:34:22 +02:00

We used to commit updated submodule hashes after tagging addons//tools repositories prior to tagging the blender.git. This way the git way of dealing with submodules was always leading to a proper and consistent repository state. This helps the external maintainers like from Linux distros. At leats that was the plan and goal.

I am not sure we can fix it for the existing releases, but it would indeed be nice to make the adjustments to the release checklist as you've mentioned.

We used to commit updated submodule hashes after tagging addons//tools repositories prior to tagging the blender.git. This way the git way of dealing with submodules was always leading to a proper and consistent repository state. This helps the external maintainers like from Linux distros. At leats that was the plan and goal. I am not sure we can fix it for the existing releases, but it would indeed be nice to make the adjustments to the release checklist as you've mentioned.

Philipp Oeser commented

2022-09-08 09:14:08 +02:00

Changed status from 'Needs Triage' to: 'Confirmed'

Thomas Dinges commented

2022-12-07 09:33:00 +01:00

Blender 3.4 is gonna be released today. To make sure I understand this correct:

I tag the submodules first, as usual:
git tag -a v3.4.0 -m "Tagging Blender 3.4.0 release"
git push origin v3.4.0
The updated hashes are commited to the Blender branch, how exactly is this done?
Tag the branch as usual as well, including the hash update commit.

Blender 3.4 is gonna be released today. To make sure I understand this correct: - I tag the submodules first, as usual: `git tag -a v3.4.0 -m "Tagging Blender 3.4.0 release"` `git push origin v3.4.0` - The updated hashes are commited to the Blender branch, **how exactly is this done?** - Tag the branch as usual as well, including the hash update commit.

Brecht Van Lommel commented

2022-12-07 11:17:47 +01:00

Running git commit release/scripts/addons release/scripts/addons_contrib release/datafiles/locale source/tools should do it.

Running `git commit release/scripts/addons release/scripts/addons_contrib release/datafiles/locale source/tools` should do it.

Thomas Dinges commented

2022-12-07 12:58:22 +01:00

Changed status from 'Confirmed' to: 'Resolved'

Thomas Dinges closed this issue

2022-12-07 12:58:22 +01:00

Thomas Dinges self-assigned this 2022-12-07 12:58:22 +01:00

Thomas Dinges commented

2022-12-07 12:58:22 +01:00