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.

Sign up for GitHub

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

Jump to bottom

Update Submodules #1473

Closed
wants to merge 1 commit into from
Closed

Update Submodules #1473

wants to merge 1 commit into from

Conversation

Fancy2209
Copy link
Contributor

No description provided.

@Fancy2209 Fancy2209 marked this pull request as ready for review January 14, 2024 20:13
@Fancy2209
Copy link
Contributor Author

oh I messed up libressl

@Fancy2209
Copy link
Contributor Author

Weird, I set the right branch but it seems it still pulled master?

@CuriousTommy
Copy link
Contributor

Why are you updating the libressl submodules? It looks like they already have the latest changes.

@Fancy2209
Copy link
Contributor Author

Fancy2209 commented Jan 15, 2024 via email

@CuriousTommy
Copy link
Contributor

CuriousTommy commented Jan 16, 2024 •
edited
Loading

So it looks likes for both darling-openjdk and darling-SmartCardServices, I forgot to merge my remove_lkm changes into the default branch, oops...

Merged the changes and removed the remove_lkm branch for both of them.

@CuriousTommy
Copy link
Contributor

I ran the git command to update submodules and it messed with libressl,

I recommend reading 7.11 Git Tools - Submodules if you are new to submodules.

Think of .gitmodules as information on where we need to clone the repo from. However, it does not have information on what commit we need to checkout from the submodule.

What you need to is cd into the submodule and checkout the commit you want to use. When you get back to the darling repo and run git status, you will see a new change. Add that change and push a commit.

I'm curious what command you used to update the submodule. Is it git submodule update --remote?

@Fancy2209
Copy link
Contributor Author

Fancy2209 commented Jan 16, 2024 •
edited
Loading

Pretty sure that's the one yes, I'm sorry I haven't gotten to finishing this yet, been a bit busy

@CuriousTommy
Copy link
Contributor

I'm going to close this PR. I created PR #1487 for updating the submodules.

@Fancy2209
Copy link
Contributor Author

I'm sorry for never having a chance of finishing this, my bad

@CuriousTommy
Copy link
Contributor

CuriousTommy commented Feb 4, 2024 •
edited
Loading

No worries! I should be thanking you for exposing me to the git submodule update --remote.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Fancy2209 @CuriousTommy