Skip to content
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

Fix regex to support optional end line of old section in diff hunk #5096

Merged
merged 3 commits into from
Oct 18, 2018
Merged

Fix regex to support optional end line of old section in diff hunk #5096

merged 3 commits into from
Oct 18, 2018

Conversation

kolaente
Copy link
Member

Previously, a hunk like this would fail:

@@ -1 +1,9 @@

(note the missing , after -1)

This pr fixes this.

@kolaente
Fix regex to support optional end line of old section in diff hunk
6aa08d4 
+ Named groups in reges for easier group parsing
@jonasfranz jonasfranz added this to the 1.6.0 milestone Oct 17, 2018
@bkcsoft bkcsoft added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Oct 17, 2018
@techknowlogick
Copy link
Member

@JonasFranzDEV 1.6 has been branched, so I'm going to move this to 1.7 milestone and set a backport label on this PR

@techknowlogick techknowlogick modified the milestones: 1.6.0, 1.7.0 Oct 17, 2018
@jonasfranz
Copy link
Member

@techknowlogick alright

@kolaente kolaente mentioned this pull request Oct 17, 2018
Merged
@kolaente
Copy link
Member Author

@techknowlogick backport pr is up: #5097

@bkcsoft bkcsoft 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 Oct 17, 2018
@codecov-io
Copy link

codecov-io commented Oct 17, 2018 •
edited
Loading

Codecov Report

Merging #5096 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #5096      +/-   ##
=========================================
+ Coverage    37.4%   37.4%   +<.01%     
=========================================
  Files         306     306              
  Lines       45374   45379       +5     
=========================================
+ Hits        16973   16975       +2     
- Misses      25947   25950       +3     
  Partials     2454    2454
Impacted Files Coverage Δ
models/git_diff.go 66.09% <100%> (+0.32%) ⬆️
models/repo_indexer.go 49.57% <0%> (-1.28%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c37d1a9...c16f0d3. Read the comment docs.

@techknowlogick techknowlogick merged commit e79e924 into go-gitea:master Oct 18, 2018
@techknowlogick techknowlogick added backport/done All backports for this PR have been created and removed backport/v1.6 labels Oct 18, 2018
@kolaente kolaente mentioned this pull request Oct 18, 2018
Closed
7 tasks
@kolaente kolaente deleted the hotfix/pr-diff-cutting branch January 24, 2019 18:16
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jonasfranz jonasfranz jonasfranz approved these changes

@lafriks lafriks lafriks approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.7.0
Development

Successfully merging this pull request may close these issues.
6 participants
@kolaente @techknowlogick @jonasfranz @codecov-io @lafriks @bkcsoft