Skip to content

Conversation

kousu
Copy link
Contributor

@kousu kousu commented Feb 14, 2023

!fixup #22177

The only place this function is used so far is in findReadmeFileInEntries(), so the only visible effect of this oversight was in an obscure README-related corner: if the README was in a subfolder and was a symlink that pointed up, as in .github/README.md -> ../docs/old/setup.md, the README would fail to render when FollowLinks() hit the nil ptree. This makes the ptree non-nil and thus repairs it.

!fixup go-gitea#22177

The only place this function is used so far is in
findReadmeFileInEntries(), so the only visible effect
of this oversight was in an obscure corner: if the
README was in a subfolder and was a symlink that pointed up,
as in .github/README.md -> ../docs/old/setup.md, the
README would fail to render when because FollowLinks()
hit the nil ptree.
@kousu
Copy link
Contributor Author

kousu commented Feb 14, 2023

For example, with this repo:

sdffsf$ tree -a -I .git
.
├── abcdef
│   └── 13423423
│       └── README.md
└── .github
    └── README.md -> ../abcdef/13423423/README.md

3 directories, 2 files

Then before #22177 (b0f1872):

Screenshot 2023-02-13 at 23-35-25 sdffsf

With #22177 (e1aca7c):

Screenshot 2023-02-13 at 23-34-26 sdffsf

But after this (df33253) it's fixed:

Screenshot 2023-02-13 at 23-37-13 sdffsf

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 14, 2023
@lunny lunny added type/bug issue/regression Indicates a previously functioning feature or behavior that has broken or regressed after a change skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Feb 14, 2023
@lunny lunny added this to the 1.19.0 milestone Feb 14, 2023
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Feb 14, 2023
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Feb 14, 2023
@lafriks
Copy link
Member

lafriks commented Feb 14, 2023

please update with base branch

@techknowlogick techknowlogick added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 14, 2023
@zeripath
Copy link
Contributor

make lgtm done

@zeripath zeripath merged commit 618c911 into go-gitea:main Feb 14, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Feb 15, 2023
* upstream/main:
  Add command to bulk set must-change-password (go-gitea#22823)
  Remember to attach the parent tree when converting TreeEntry() -> Tree() (go-gitea#22902)
  Fix dark-colored description text in arc-green theme (go-gitea#22908)
  Fix the full-height problem for all pages (go-gitea#22905)
  Remove Fomantic-UI's `.hidden` CSS class for menu elements (go-gitea#22895)
@lunny lunny removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 15, 2023
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
issue/regression Indicates a previously functioning feature or behavior that has broken or regressed after a change lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants