about summary refs log tree commit diff
path: root/compiler/rustc_interface/src/errors.rs
diff options
context:
space:
mode:
authorfee1-dead <ent3rm4n@gmail.com>2023-07-06 09:20:34 +0800
committerGitHub <noreply@github.com>2023-07-06 09:20:34 +0800
commit70e8f9d4c01a7293ce1395bf1ad6c84f4432e0e3 (patch)
tree2e7c4c57da3cc6d03e514580f9c38f41f64073a4 /compiler/rustc_interface/src/errors.rs
parent2bc0ae3f33f014f043efecd5b91bb574ea4a855d (diff)
parent6c7017fa0a49f170bbe9d0053b72f996770fdb42 (diff)
downloadrust-70e8f9d4c01a7293ce1395bf1ad6c84f4432e0e3.tar.gz
rust-70e8f9d4c01a7293ce1395bf1ad6c84f4432e0e3.zip
Rollup merge of #113371 - jyn514:submodule-with-tags, r=albertlarsan68
Fix submodule handling when the current branch is named after a tag

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.
Diffstat (limited to 'compiler/rustc_interface/src/errors.rs')
0 files changed, 0 insertions, 0 deletions