From 66649d9c81b4a80f85702a7f3e10eaedb32afd87 Mon Sep 17 00:00:00 2001 From: LeSeulArtichaut Date: Sat, 10 Oct 2020 17:46:04 +0200 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Joshua Nelson --- src/git.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/git.md b/src/git.md index f9a6fca4..2d2200b3 100644 --- a/src/git.md +++ b/src/git.md @@ -95,7 +95,18 @@ 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]. + +[#77620](https://github.com/rust-lang/rust/issues/77620#issuecomment-705228229) ## Conflicts