-
Notifications
You must be signed in to change notification settings - Fork 12.5k
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 submodule handling when the current branch is named after a tag #113371
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If: 1. The current branch has the same name as git tag, and 2. The current branch is set to track a remote other than `origin`, and 3. We try to update a submodule then we'll get the following error: ``` ; x c Updating submodule src/doc/reference remote: Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 fatal: 'personal' does not appear to be a git repository fatal: Could not read from remote repository. ``` The problem is that 1. causes `git symbolic-ref --short HEAD` to try and disambiguate the branch from the tag using `heads/branch-name`, which breaks a previous workaround for a bug in `git submodule update` that uses the wrong remote. Adapt the workaround to strip `heads/` from the output.
(rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
T-bootstrap
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
labels
Jul 5, 2023
jyn514
added
the
A-contributor-roadblock
Area: Makes things more difficult for new contributors to rust itself
label
Jul 5, 2023
Thanks for the PR! |
bors
added
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Jul 5, 2023
yup, this should have no effect at all if there's no tag - that's what |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 6, 2023
…fee1-dead Rollup of 9 pull requests Successful merges: - rust-lang#111119 (style-guide: Add chapter about formatting for nightly-only syntax) - rust-lang#112791 (llvm ffi: Expose `CallInst->setTailCallKind`) - rust-lang#113145 (style-guide: Document newline rules for assignment operators) - rust-lang#113163 (Add a regression test for rust-lang#112895) - rust-lang#113332 (resolve: Use `Interned` for some interned structures) - rust-lang#113334 (Revert the lexing of `c"…"` string literals) - rust-lang#113350 (Fix the issue of wrong diagnosis for extern pub fn) - rust-lang#113371 (Fix submodule handling when the current branch is named after a tag) - rust-lang#113384 (style-guide: Clarify grammar for small patterns (not a semantic change)) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
A-contributor-roadblock
Area: Makes things more difficult for new contributors to rust itself
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
T-bootstrap
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If:
origin
, andthen we'll get the following error:
The problem is that 1. causes
git symbolic-ref --short HEAD
to try and disambiguate the branch from the tag usingheads/branch-name
, which breaks a previous workaround for a bug ingit submodule update
that uses the wrong remote.Adapt the workaround to strip
heads/
from the output.