From c71aa2ad3a0843a45e5ab488ba408dd054094fc0 Mon Sep 17 00:00:00 2001 From: Tshepang Mbambo Date: Sun, 14 Aug 2022 10:44:26 +0200 Subject: [PATCH 1/2] reformat section --- src/git.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/git.md b/src/git.md index d32274c64..9691e5370 100644 --- a/src/git.md +++ b/src/git.md @@ -157,9 +157,12 @@ 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](#git-submodules)). To get rid of those, run `git submodule update` (or run any `x.py` command, which will automatically update the submodules). -Note that there is (as of February 2022) a [bug][#77620] if you use -worktrees, submodules, and `x.py` in a commit hook. If you run into an error -like: +Note that, +as of February 2022, +there is a [bug][#77620] if you use worktrees, +submodules, and `x.py` in a commit hook. +If you run into an error like the following, +it's not anything you did wrong: ``` error: failed to read `/home/joshua/rustc-worktree/src/tools/miri/cargo-miri/Cargo.toml` @@ -167,7 +170,8 @@ error: failed to read `/home/joshua/rustc-worktree/src/tools/miri/cargo-miri/Car Caused by: No such file or directory (os error 2) ``` -it's not anything you did wrong. There is a workaround in [the issue][#77620-workaround]. + +There is a workaround in [the issue][#77620-workaround]. [#77620]: https://github.com/rust-lang/rust/issues/77620 [#77620-workaround]: https://github.com/rust-lang/rust/issues/77620#issuecomment-705228229 From 6ec0410dc5de4445869f42b8f3fb5a4fe2694395 Mon Sep 17 00:00:00 2001 From: Tshepang Mbambo Date: Sun, 14 Aug 2022 10:45:05 +0200 Subject: [PATCH 2/2] date-check: git --- src/git.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/git.md b/src/git.md index 9691e5370..5899753ba 100644 --- a/src/git.md +++ b/src/git.md @@ -158,7 +158,7 @@ These changes are not changes to files: they are changes to submodules (more on this [later](#git-submodules)). To get rid of those, run `git submodule update` (or run any `x.py` command, which will automatically update the submodules). Note that, -as of February 2022, +as of Aug 2022, there is a [bug][#77620] if you use worktrees, submodules, and `x.py` in a commit hook. If you run into an error like the following,