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.

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

Addresses diff-issue with blanks in pathname #12768 #12769

Closed
wants to merge 3 commits into from
Closed

Addresses diff-issue with blanks in pathname #12768 #12769

wants to merge 3 commits into from

Conversation

fashberg
Copy link
Contributor

@fashberg fashberg commented Sep 8, 2020

Proposal to address this bug: Since 1.12.4 diff not working with blanks in filename or pathname #12768

  • not splitting OldName and NewName at first blank
  • improved tests to check correct naming

@zeripath
Copy link
Contributor

zeripath commented Sep 8, 2020

This won't work I'm afraid - consider this:

diff --git a/a b/file b/a a/file b/a b/file b/a a/file
index d2186f1..f5c8ed2 100644
--- a/a b/file b/a a/file	
+++ b/a b/file b/a a/file	
@@ -1,3 +1,2 @@
 Create a weird file.
 
-and what does diff do here?
\ No newline at end of file

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 8, 2020
@codecov-commenter
Copy link

Codecov Report

Merging #12769 into master will decrease coverage by 0.04%.
The diff coverage is 75.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #12769      +/-   ##
==========================================
- Coverage   43.25%   43.21%   -0.05%     
==========================================
  Files         648      648              
  Lines       71928    71947      +19     
==========================================
- Hits        31111    31090      -21     
- Misses      35775    35817      +42     
+ Partials     5042     5040       -2     
Impacted Files Coverage Δ
services/gitdiff/gitdiff.go 74.29% <75.00%> (-0.26%) ⬇️
modules/indexer/stats/queue.go 52.94% <0.00%> (-23.53%) ⬇️
modules/indexer/stats/db.go 43.47% <0.00%> (-17.40%) ⬇️
services/pull/check.go 31.53% <0.00%> (-16.16%) ⬇️
modules/git/utils.go 73.77% <0.00%> (-3.28%) ⬇️
modules/queue/workerpool.go 58.77% <0.00%> (-1.23%) ⬇️
modules/log/event.go 57.54% <0.00%> (-0.95%) ⬇️
models/pull.go 54.54% <0.00%> (-0.63%) ⬇️
modules/git/repo.go 49.23% <0.00%> (-0.51%) ⬇️
services/pull/pull.go 41.57% <0.00%> (ø)
... and 2 more

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 bea343c...e1bc563. Read the comment docs.

@fashberg fashberg closed this Sep 9, 2020
@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.
Labels
lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants