A couple of minor fixes #1882
Merged
A couple of minor fixes #1882
Conversation
This file contains hidden or 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
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
Note that this commit might look like it fixes a major regression where images may be missing. However, in #1804 the images were added correctly. I have not quite figured out why but I think that I may have introduced the regression _after the book contents were auto-generated. |
Recent revisions of the ProGit book have their images in the `images/` directory located at the top-level, but older revisions had them next to the chapters that referenced those images. The `update-book2.rb` script has a fall-back to allow those images to be copied from the old-style locations. This fall-back relies on an exception to be raised when an image does not show up in the new-style location, but we returned a warning instead. Let's not. Let's raise that exception again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When an image is not found in the new-style location (i.e. in the `images/` folder at the top level of the worktree), we want to fall back to the old-style location _and not warn anybody about it_! Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
ttaylorr
approved these changes
Sep 26, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Changes
This PR fixes a couple of minor issues.
Context
While working on a couple of fall-out issues after #1804 was merged, I noticed a couple of minor issues. They are not big enough to warrant any test updates, but they are different enough from the stuff I was actually working on that I felt uncomfortable slipping these changes into those PRs.