Merge #7189

7189: Extend git evacuation procedure r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>

diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs
index d1ffb70ad1bcf6ef338b67625426cb945ef4e775..7e5b1f7b53959074367a34c6dbae2dcbd4ad7753 100644 (file)
--- a/xtask/tests/tidy.rs
+++ b/xtask/tests/tidy.rs
@@ -107,8 +107,13 @@ fn check_merge_commits() {
 on top of master by running `git rebase master`. If rebase fails,
 you can re-apply your changes like this:
 
-  # Abort in-progress rebase, if any.
+  # Just look around to see the current state.
+  $ git status
+  $ git log
+
+  # Abort in-progress rebase and merges, if any.
   $ git rebase --abort
+  $ git merge --abort
 
   # Make the branch point to the latest commit from master,
   # while maintaining your local changes uncommited.
@@ -117,10 +122,17 @@ fn check_merge_commits() {
   # Commit all changes in a single batch.
   $ git commit -am'My changes'
 
+  # Verify that everything looks alright.
+  $ git status
+  $ git log
+
   # Push the changes. We did a rebase, so we need `--force` option.
   # `--force-with-lease` is a more safe (Rusty) version of `--force`.
   $ git push --force-with-lease
 
+  # Verify that both local and remote branch point to the same commit.
+  $ git log
+
 And don't fear to mess something up during a rebase -- you can
 always restore the previous state using `git ref-log`: