Skip to content

Commit 7445c81

Browse files
LeSeulArtichautJoshua Nelson
and
Joshua Nelson
authored
Apply suggestions from code review
Co-authored-by: Joshua Nelson <[email protected]>
1 parent 1abd75a commit 7445c81

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/git.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,15 @@ no changes added to commit (use "git add" and/or "git commit -a")
9595

9696
These changes are not changes to files: they are changes to submodules
9797
(more on this later). To get rid of those, run `git submodule update` (or run any
98-
`x.py` command which will automatically update the submodules).
98+
`x.py` command, which will automatically update the submodules).
99+
Note that there is currently a bug if you use worktrees, submodules, and x.py in a commit hook. If you run into an error like
100+
```
101+
error: failed to read `/home/joshua/rustc-worktree/src/tools/miri/cargo-miri/Cargo.toml`
99102
103+
Caused by:
104+
No such file or directory (os error 2)
105+
```
106+
it's not anything you did wrong. There is a workaround at [#77620](https://github.com/rust-lang/rust/issues/77620#issuecomment-705228229).
100107
## Conflicts
101108

102109
When you edit your code locally, you are making changes to the version of

0 commit comments

Comments
 (0)