Fix a bug in retrofit-worktree.sh #38676
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Documentation preview for this PR (built with commit 63f5007; changes) is ready! 🎉 |
5 tasks
mkoeppe
approved these changes
Sep 26, 2024
|
Thanks! |
vbraun
pushed a commit
to vbraun/sage
that referenced
this pull request
Sep 27, 2024
<!-- ^ Please provide a concise and informative title. --> <!-- ^ Don't put issue numbers in the title, do this in the PR description below. --> <!-- ^ For example, instead of "Fixes sagemath#12345" use "Introduce new method to calculate 1 + 2". --> <!-- v Describe your changes below in detail. --> <!-- v Why is this change required? What problem does it solve? --> <!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes sagemath#12345". --> as shown in https://github.com/sagemath/sage/actions/runs/10919536449/jo b/30307397930?pr=38659, where the error message ``` [sagemath_doc_html-none] [spkg-install] [installat] /sage/src/doc/en/installation/linux.rst: WARNING: document isn't included in any toctree ``` is due to the file `src/doc/en/installation/linux.rst` that is not cleaned up in the "new" branch being tested. The problem is that the script does not clean the worktree well enough when checking out the "new" branch. Test: https://github.com/sagemath/sage/actions/runs/10934323900/job/3035 4225389?pr=38659, an excerpt from which is ``` sagemath#30 6.340 + cd worktree-pre sagemath#30 6.340 + git add -A sagemath#30 6.989 + git commit --quiet --allow-empty -m old -a sagemath#30 7.071 + git tag -f old sagemath#30 7.073 + git checkout -f new sagemath#30 7.106 Previous HEAD position was 98054dd old sagemath#30 7.106 HEAD is now at b05f634 new sagemath#30 7.107 + git clean -fd sagemath#30 7.159 Removing src/doc/en/installation/linux.rst sagemath#30 7.159 + git status sagemath#30 7.243 HEAD detached at new sagemath#30 7.243 nothing to commit, working tree clean ``` ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [x] The title is concise and informative. - [x] The description explains in detail what this PR is about. - [x] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - sagemath#12345: short description why this is a dependency --> <!-- - sagemath#34567: ... --> URL: sagemath#38676 Reported by: Kwankyu Lee Reviewer(s): Matthias Köppe
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
as shown in https://github.com/sagemath/sage/actions/runs/10919536449/job/30307397930?pr=38659, where the error message
is due to the file
src/doc/en/installation/linux.rstthat is not cleaned up in the "new" branch being tested.The problem is that the script does not clean the worktree well enough when checking out the "new" branch.
Test: https://github.com/sagemath/sage/actions/runs/10934323900/job/30354225389?pr=38659, an excerpt from which is
📝 Checklist
⌛ Dependencies