Skip to content

Fail when a git submodule fails to update instead of ignoring the error#6132

Merged
kit-ty-kate merged 3 commits intoocaml:masterfrom
kit-ty-kate:git-submodule-fail
Aug 20, 2024
Merged

Fail when a git submodule fails to update instead of ignoring the error#6132
kit-ty-kate merged 3 commits intoocaml:masterfrom
kit-ty-kate:git-submodule-fail

Conversation

@kit-ty-kate
Copy link
Copy Markdown
Member

Fixes #6131

@kit-ty-kate kit-ty-kate added this to the 2.3.0~alpha milestone Jul 31, 2024
@kit-ty-kate kit-ty-kate force-pushed the git-submodule-fail branch 2 times, most recently from cab43a1 to ed71ca0 Compare July 31, 2024 09:22
Copy link
Copy Markdown
Collaborator

@rjbou rjbou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the code itself, lgtm!
Some remarks:

  • The title of the PR doesn't fit the content, the second commit it more submodules handling than the failure itself. It needs to be updated by something more general, like "git submodules enhancements".
  • Add a test to highlight the modifications, and follow them

@kit-ty-kate
Copy link
Copy Markdown
Member Author

I've split off the second commit in #6153 and added a test

@kit-ty-kate kit-ty-kate requested a review from rjbou August 13, 2024 12:21
@kit-ty-kate kit-ty-kate force-pushed the git-submodule-fail branch 7 times, most recently from bffc94f to 2a1e199 Compare August 16, 2024 19:45
@rjbou rjbou force-pushed the git-submodule-fail branch from 2a1e199 to 1d034d0 Compare August 20, 2024 15:32
@rjbou rjbou force-pushed the git-submodule-fail branch from 1d034d0 to d442c01 Compare August 20, 2024 15:38
Copy link
Copy Markdown
Collaborator

@rjbou rjbou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

Comment on lines +12 to +14
### ### This test may fail locally depending on your git version
### ### File protocol is removed locally since git 2.38,
### ### to fix a CVE: https://www.cve.org/CVERecord?id=CVE-2022-39253
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added that note

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That note isn't quite true. Only a couple of versions have file protocol disabled. More recent git versions work just fine

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah nevermind, what i'm saying is not true. My memory failed me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

failure to fetch git submodules are not errors

3 participants