Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
  • Loading branch information
LeSeulArtichaut and Joshua Nelson authored Oct 10, 2020
1 parent 1abd75a commit 7445c81
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion src/git.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,15 @@ no changes added to commit (use "git add" and/or "git commit -a")

These changes are not changes to files: they are changes to submodules
(more on this later). To get rid of those, run `git submodule update` (or run any
`x.py` command which will automatically update the submodules).
`x.py` command, which will automatically update the submodules).
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
```
error: failed to read `/home/joshua/rustc-worktree/src/tools/miri/cargo-miri/Cargo.toml`
Caused by:
No such file or directory (os error 2)
```
it's not anything you did wrong. There is a workaround at [#77620](https://github.com/rust-lang/rust/issues/77620#issuecomment-705228229).
## Conflicts

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

0 comments on commit 7445c81

Please sign in to comment.