Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft: Attempt to fix submodules being marked as removed in subdirs #5277

Closed
wants to merge 1 commit into from

Conversation

TheZoq2
Copy link

@TheZoq2 TheZoq2 commented Jan 6, 2025

This appears to fix #5246 but I'm very unsure if it is the correct way to solve the problem. I figured it is better to open a PR than not though.

This seems to be the correct place to put the fix since the other place that filters for submodule deletion is also done prior to pushing into deleted_files_tx at line 1404 of local_working_copy.rs

I suppose this also needs tests etc. and I could use some guidance on how to do that.

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

Copy link

google-cla bot commented Jan 6, 2025

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@arxanas
Copy link
Contributor

arxanas commented Jan 7, 2025

Possibly superseded by #5285?

By the way, if you have concerns about the CLA, see #4849 for more discussion.

@TheZoq2
Copy link
Author

TheZoq2 commented Jan 7, 2025

Yes, #5285 seems to have solved the issue for me, thanks!

@TheZoq2 TheZoq2 closed this Jan 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Git submodule gets deleted and cannot be restored
2 participants