You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: src/git.md
+7-7
Original file line number
Diff line number
Diff line change
@@ -239,17 +239,19 @@ no changes added to commit (use "git add" and/or "git commit -a")
239
239
```
240
240
241
241
These changes are not changes to files: they are changes to submodules (more on
242
-
this [later](#git-submodules)). To get rid of those, run `git submodule update`
243
-
(or run any `x.py` command, which will automatically update the submodules).
244
-
Note that,
245
-
as of <!-- date-check --> Aug 2022,
242
+
this [later](#git-submodules)). To get rid of those, run `./x.py --help`, which will automatically update the submodules.
243
+
244
+
Some submodules are not actually needed; for example, `src/llvm-project` doesn't need to be checked out if you're using `download-ci-llvm`.
245
+
To avoid having to keep fetching its history, you can use `git submodule deinit -f src/llvm-project`, which will also avoid it showing as modified again.
246
+
247
+
Note that, as of <!-- date-check --> Aug 2022,
246
248
there is a [bug][#77620] if you use worktrees,
247
249
submodules, and `x.py` in a commit hook.
248
250
If you run into an error like the following,
249
251
it's not anything you did wrong:
250
252
251
253
```
252
-
error: failed to read `/home/joshua/rustc-worktree/src/tools/miri/cargo-miri/Cargo.toml`
254
+
error: failed to read `/home/jyn/rustc-worktree/src/tools/cargo/Cargo.toml`
253
255
254
256
Caused by:
255
257
No such file or directory (os error 2)
@@ -260,8 +262,6 @@ There is a workaround in [the issue][#77620-workaround].
0 commit comments