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

Fix upstream not refreshing after pull #1269

Merged
merged 2 commits into from
Jan 6, 2025

Conversation

danielrbradley
Copy link
Member

@danielrbradley danielrbradley commented Jan 6, 2025

When running git pull, the upstream HEAD will not be updated if recursive submodule checkout is not enabled (as is the default).

  1. Add ./upstream.sh file_target command which just prints the upstream HEAD file path, if it exists (mimicking the existing wildcard statement).
  2. Before printing, mark the file as updated if it doesn't match the new desired commit which will then trigger the upstream init to run and update the submodule.

When running `git pull`, the upstream HEAD will not be updated if recursive submodule checkout is not enabled (as is the default).

1. Add "./upstream.sh file_target" command which just prints the upstream HEAD file path, if it exists.
2. Before printing, mark the file as updated if it doesn't match the new desired commit which will then trigger the upstream init to run and update the submodule.
@danielrbradley danielrbradley requested review from guineveresaenger and a team January 6, 2025 11:53
@danielrbradley danielrbradley self-assigned this Jan 6, 2025
@danielrbradley danielrbradley added this pull request to the merge queue Jan 6, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 6, 2025
@danielrbradley danielrbradley added this pull request to the merge queue Jan 6, 2025
Merged via the queue into master with commit a33de94 Jan 6, 2025
6 checks passed
@danielrbradley danielrbradley deleted the fix-upstream-out-of-date branch January 6, 2025 18:27
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.

2 participants