Skip to content

Don't display error log when .git-blame-ignore-revs doesn't exist #34457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 13 commits into from
May 26, 2025
Merged

Don't display error log when .git-blame-ignore-revs doesn't exist #34457

merged 13 commits into from
May 26, 2025

Conversation

lunny
Copy link
Member

@lunny lunny commented May 13, 2025

Fix #34454

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 13, 2025
@lunny lunny added backport/v1.24 This PR should be backported to Gitea 1.24 and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 13, 2025
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label May 13, 2025
@lunny lunny mentioned this pull request May 13, 2025
Closed
wxiaoguang
wxiaoguang reviewed May 14, 2025
View reviewed changes
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 14, 2025
@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 May 25, 2025
@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 May 25, 2025
@delvh delvh added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 25, 2025
wxiaoguang
wxiaoguang reviewed May 25, 2025
View reviewed changes
@wxiaoguang wxiaoguang removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 25, 2025
wxiaoguang
wxiaoguang reviewed May 25, 2025
View reviewed changes
wxiaoguang
wxiaoguang reviewed May 26, 2025
View reviewed changes
wxiaoguang
wxiaoguang reviewed May 26, 2025
View reviewed changes
@techknowlogick techknowlogick enabled auto-merge (squash) May 26, 2025 16:14
@techknowlogick techknowlogick added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 26, 2025
@techknowlogick techknowlogick merged commit ab96912 into go-gitea:main May 26, 2025
26 checks passed
@GiteaBot GiteaBot added this to the 1.25.0 milestone May 26, 2025
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 26, 2025
@lunny lunny deleted the lunny/handle_error branch May 26, 2025 18:16
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request May 26, 2025
@lunny @GiteaBot
Don't display error log when .git-blame-ignore-revs doesn't exist (go…
97e43cb 
…-gitea#34457)

Fix go-gitea#34454
@GiteaBot GiteaBot mentioned this pull request May 26, 2025
Merged
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label May 26, 2025
silverwind pushed a commit that referenced this pull request May 26, 2025
@GiteaBot @lunny
Don't display error log when .git-blame-ignore-revs doesn't exist (#3…
a6a14c9 
…4457) (#34540)

Backport #34457 by @lunny

Fix #34454

Co-authored-by: Lunny Xiao <[email protected]>
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 27, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
1794de8 
* giteaofficial/main:
  Split GetLatestCommitStatus as two functions (go-gitea#34535)
  Don't display error log when .git-blame-ignore-revs doesn't exist (go-gitea#34457)
  Add sort option recentclose for issues and pulls (go-gitea#34525)
  fix: return 201 Created for CreateVariable API responses (go-gitea#34517)
  Actions list (go-gitea#34530)
hantang pushed a commit to qundao/mirror-forgejo that referenced this pull request Jun 17, 2025
@jerger @MarkusAmshove @lunny
[gitea] week 2025-21 cherry pick (gitea/main -> forgejo) (#8040)
9ea796b 
## Checklist

- [x] go to the last cherry-pick PR (forgejo/forgejo#7965) to figure out how far it went: [gitea@9d4ebc1f2c](go-gitea/gitea@9d4ebc1)
- [x] cherry-pick and open PR (forgejo/forgejo#8040)
- [ ] have the PR pass the CI
- end-to-end (specially important if there are actions related changes)
  - [ ] add `run-end-to-end` label
  - [ ] check the result
- [ ] write release notes
- [ ] assign reviewers
- [ ] 48h later, last call
- merge 1 hour after the last call

## Legend

- ❓ - No decision about the commit has been made.
- 🍒 - The commit has been cherry picked.
- ⏩ - The commit has been skipped.
- 💡 - The commit has been skipped, but should be ported to Forgejo.
- ✍️ - The commit has been skipped, and a port to Forgejo already exists.

## Commits

- 🍒 [`gitea`](go-gitea/gitea@50d9565) -> [`forgejo`](https://codeberg.org/forgejo/forgejo/commit/c3e6eab73235ac189ca3a36ce2b8ea8d8ad82c81) Add sort option recentclose for issues and pulls ([gitea#34525](go-gitea/gitea#34525))

## TODO

- 💡 [`gitea`](go-gitea/gitea@d5bbaee) Retain issue sort type when a keyword search is introduced ([gitea#34559](go-gitea/gitea#34559))
  UI: Small bat might be nice. Test needed? Do we've frontend tests covering the search?
------
- 💡 [`gitea`](go-gitea/gitea@82ea238) Always use an empty line to separate the commit message and trailer ([gitea#34512](go-gitea/gitea#34512))
  Needs merge
------
- 💡 [`gitea`](go-gitea/gitea@74858dc) Fix line-button issue after file selection in file tree ([gitea#34574](go-gitea/gitea#34574))
  Frontend: Makes it sense to pick/port ui logic in *.ts files?
------
- 💡 [`gitea`](go-gitea/gitea@7149c9c) Fix doctor deleting orphaned issues attachments ([gitea#34142](go-gitea/gitea#34142))
  Doctor: seems useful.
------
- 💡 [`gitea`](go-gitea/gitea@0cec4b8) Fix actions skipped commit status indicator ([gitea#34507](go-gitea/gitea#34507))
  Actions: Might benefit from additional tests.
------
- 💡 [`gitea`](go-gitea/gitea@4cb0c64) Add "View workflow file" to Actions list page ([gitea#34538](go-gitea/gitea#34538))
  Actions: Needs tests
------
- 💡 [`gitea`](go-gitea/gitea@b0936f4) Do not mutate incoming options to RenderUserSearch and SearchUsers ([gitea#34544](go-gitea/gitea#34544))
  Nice refactoring but needs manual merge.
------
- 💡 [`gitea`](go-gitea/gitea@498088c) Add webhook assigning test and fix possible bug ([gitea#34420](go-gitea/gitea#34420))
  Integrationtest has conflicts needs merge.
------
- 💡 [`gitea`](go-gitea/gitea@24a5105) Fix possible nil description of pull request when migrating from CodeCommit ([gitea#34541](go-gitea/gitea#34541))
  Is this relevant to forgejo? Did not find the place to apply this small change.
------
- 💡 [`gitea`](go-gitea/gitea@688da55) Split GetLatestCommitStatus as two functions ([gitea#34535](go-gitea/gitea#34535))
  Merge required.
------
- 💡 [`gitea`](go-gitea/gitea@ab96912) Don't display error log when .git-blame-ignore-revs doesn't exist ([gitea#34457](go-gitea/gitea#34457))
  Unsure wheter this affects forgejo. Tests missing.
------
- 💡 [`gitea`](go-gitea/gitea@11ee7ff) fix: return 201 Created for CreateVariable API responses ([gitea#34517](go-gitea/gitea#34517))
  Actions: This is marked as breaking the api. Pls think about whether this breaking change iss needed & how this impact api-version-increase.
  The corresponding clinet change can be found here: https://gitea.com/gitea/go-sdk/pulls/713/files
------
- 💡 [`gitea`](go-gitea/gitea@9b295e9) Actions list ([gitea#34530](go-gitea/gitea#34530))
  Actions: Regression from go-gitea/gitea#34337 Part of https://codeberg.org/forgejo/forgejo/pulls/7909
------

## Skipped

- ⏩ [`gitea`](go-gitea/gitea@bb6377d) [skip ci] Updated translations via Crowdin
------
- ⏩ [`gitea`](go-gitea/gitea@07d802a) [skip ci] Updated translations via Crowdin
------
- ⏩ [`gitea`](go-gitea/gitea@c6e2093) Clean up "file-view" related styles ([gitea#34558](go-gitea/gitea#34558))

  - gitea ui specific specific
------
- ⏩ [`gitea`](go-gitea/gitea@9f10885) Refactor commit reader ([gitea#34542](go-gitea/gitea#34542))

  - gitea refactor specific
------

<details>
<summary><h2>Stats</h2></summary>

<br>

Between [`gitea@9d4ebc1f2c`](go-gitea/gitea@9d4ebc1) and [`gitea@d5bbaee64e`](go-gitea/gitea@d5bbaee), **18** commits have been reviewed. We picked **1**, skipped **4**, and decided to port **13**.

</details>

Co-authored-by: Markus Amshove <[email protected]>
Co-authored-by: Lunny Xiao <[email protected]>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8040
Reviewed-by: Earl Warren <[email protected]>
Co-authored-by: Michael Jerger <[email protected]>
Co-committed-by: Michael Jerger <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wxiaoguang wxiaoguang wxiaoguang left review comments

@lafriks lafriks lafriks approved these changes

@yp05327 yp05327 yp05327 approved these changes

@delvh delvh delvh approved these changes

@hiifong hiifong hiifong approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.24 This PR should be backported to Gitea 1.24 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code
Projects
None yet
Milestone
1.25.0
Development

Successfully merging this pull request may close these issues.

gitea 1.24-nightly strange error in logs
8 participants
@lunny @lafriks @wxiaoguang @yp05327 @delvh @hiifong @techknowlogick @GiteaBot