[PR #5096] [MERGED] Fix regex to support optional end line of old section in diff hunk #17637

New Issue

GiteaMirror · 2025-11-02T14:37:55-06:00

GiteaMirror commented

2025-11-02 14:37:55 -06:00

📋 Pull Request Information

Original PR: https://github.com/go-gitea/gitea/pull/5096
Author: @kolaente
Created: 10/17/2018
Status: ✅ Merged
Merged: 10/18/2018
Merged by: @techknowlogick

Base: master ← Head: hotfix/pr-diff-cutting

📝 Commits (3)

6aa08d4 Fix regex to support optional end line of old section in diff hunk
4d3a919 Merge branch 'master' into hotfix/pr-diff-cutting
c16f0d3 Merge branch 'master' into hotfix/pr-diff-cutting

📊 Changes

1 file changed (+16 additions, -9 deletions)

View changed files

📝 models/git_diff.go (+16 -9)

📄 Description

Previously, a hunk like this would fail:

@@ -1 +1,9 @@

(note the missing , after -1)

This pr fixes this.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/go-gitea/gitea/pull/5096 **Author:** [@kolaente](https://github.com/kolaente) **Created:** 10/17/2018 **Status:** ✅ Merged **Merged:** 10/18/2018 **Merged by:** [@techknowlogick](https://github.com/techknowlogick) **Base:** `master` ← **Head:** `hotfix/pr-diff-cutting` --- ### 📝 Commits (3) - [`6aa08d4`](https://github.com/go-gitea/gitea/commit/6aa08d4bf9a5c4567a11aba3b1845f10d7f274ce) Fix regex to support optional end line of old section in diff hunk - [`4d3a919`](https://github.com/go-gitea/gitea/commit/4d3a919e3e09cd1a59013e2265135446bfa3ae7d) Merge branch 'master' into hotfix/pr-diff-cutting - [`c16f0d3`](https://github.com/go-gitea/gitea/commit/c16f0d3af2a9f36ffbdc98ec7d182a7a3ac35b6d) Merge branch 'master' into hotfix/pr-diff-cutting ### 📊 Changes **1 file changed** (+16 additions, -9 deletions) <details> <summary>View changed files</summary> 📝 `models/git_diff.go` (+16 -9) </details> ### 📄 Description Previously, a hunk like this would fail: ```diff @@ -1 +1,9 @@ ``` (note the missing `,` after `-1`) This pr fixes this. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

GiteaMirror added the pull-request label 2025-11-02 14:37:55 -06:00

GiteaMirror closed this issue

2025-11-02 14:37:59 -06:00

Sign in to join this conversation.

Branches Tags

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/gitea#17637