x.py submodule handling breaks when tracking upstream as upstream
#101144
Labels
C-bug
Category: This is a bug.
T-bootstrap
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Comments
rustbot
added
T-bootstrap
|
Additional info: switching to a new branch that is not tracking upstream succeeds, so it is the upstream tracking that's messing something up: terminal session |
|
My current working theory is that this is a git bug (maybe we can work around it though). I think this is because git has created the submodule with a remote of I'm not sure what we should be doing to avoid this -- my guess is a proper fix would be in git itself... it might be that we can try to workaround it somehow, but I'm not seeing an obvious hook for us to attach to. |
|
Can we report this bug upstream to git? I think they use a mailing list? |
|
I was not able to reproduce this locally :/ I tried and it checked out the submodules successfully. I'm using |
|
For me this happens only sometimes. Most of the time when I checkout an old branch. I think I've got a reproduction (by checking out an old commit and pushing a branch to my fork), probably has unnecessary steps, but it seems to be "working" for me. ; git clone git@github.com:rust-lang/rust.git git-bug
; cd git-bug
; git remote add fork git@github.com:WaffleLapkin/rust.git # replace with your own fork
; x setup compiler
; x c compiler # (optionally) cancel after all submodules are fetched
; git checkout HEAD~5000
; git switch -c new_test_branch_so_maybe_the_bug_will_show_up
; git commit --allow-empty -m "it's a commit, nothing more, nothing less"
; git push -u fork
; x c compiler
Updating only changed submodules
Updating submodule src/tools/rust-installer
fatal: 'fork' does not appear to be a git repository
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
fatal: Fetched in submodule path 'src/tools/rust-installer', but it did not contain d66f476b4d5e7fdf1ec215c9ac16c923dc292324. Direct fetching of that commit failed.
Traceback (most recent call last):
File "/home/waffle/projects/repos/git-bug/x.py", line 11, in <module>
bootstrap.main()
File "/home/waffle/projects/repos/git-bug/src/bootstrap/bootstrap.py", line 1009, in main
bootstrap(help_triggered)
File "/home/waffle/projects/repos/git-bug/src/bootstrap/bootstrap.py", line 969, in bootstrap
build.update_submodules()
File "/home/waffle/projects/repos/git-bug/src/bootstrap/bootstrap.py", line 845, in update_submodules
self.update_submodule(module[0], module[1], recorded_submodules)
File "/home/waffle/projects/repos/git-bug/src/bootstrap/bootstrap.py", line 797, in update_submodule
run(update_args, cwd=self.rust_root, verbose=self.verbose, exception=True)
File "/home/waffle/projects/repos/git-bug/src/bootstrap/bootstrap.py", line 143, in run
raise RuntimeError(err)
RuntimeError: failed to run: git submodule update --init --recursive --progress src/tools/rust-installer
git version: ; git --version --build-options
git version 2.37.3
cpu: x86_64
no commit associated with this build
sizeof-long: 8
sizeof-size_t: 8
shell-path: /bin/sh |
|
To make @WaffleLapkin's steps reproducible - HEAD is currently 750bd1a |
|
Oh lol, I just ran into this today. A bit more info: |
On the bright side, this means it's easy to work around the bug. |
|
ah hmm, after doing that I can no longer reproduce the bug ... I think this might only happen on the very first submodule we try to clone? git is acting so strangely ... this happens even in a fresh worktree, it's only when it's a fresh clone it hits this problem, which makes no sense to me since submodules aren't shared between worktrees. Anyway, here's a minimal reproduction that doesn't depend on exactly which commit you're using, or I'll put up a PR shortly. |
jyn514
added a commit
to jyn514/rust
that referenced
this issue
Dec 24, 2022
This works around a bug in git itself; see rust-lang#101144.
rust-cloud-vms bot
pushed a commit
to jyn514/rust
that referenced
this issue
Jan 14, 2023
This works around a bug in git itself; see rust-lang#101144.
compiler-errors
added a commit
to compiler-errors/rust
that referenced
this issue
Jan 29, 2023
…ark-Simulacrum
Pass `branch.{branch}.remote=origin` to `git submodule update`
This works around a bug in git itself.
Fixes rust-lang#101144.
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
git --version --build-optionsExample:
D:\tmp〉git clone git@github.com:rust-lang/rust.git -o upstreamD:\tmp〉cd rust〉master:rust〉python ./x.py setup(continued)
〉master:rust〉git show-ref HEAD@rustbot label +C-bug +A-bootstrap
The text was updated successfully, but these errors were encountered: