1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-29 09:31:11 -05:00
forgejo/modules/repofiles
zeripath edfebe65b1
Finally fix diff names (#13136)
* Finally fix diff names

#12771 attempted to fix diff by avoiding the git diff line as
it is possible to have an ambiguous line here.

#12254 attempted to fix diff by assuming that names would quoted
if they needed to be and if one was quoted then both would be.

Both of these were wrong.

I have now discovered `--src-prefix` and `--dst-prefix` which
means that we can set this in such a way to force the git diff
to always be unambiguous.

Therefore this PR rollsback most of the changes in #12771 and
uses these options to fix this.

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Update services/gitdiff/gitdiff.go

* Update services/gitdiff/gitdiff.go

* Update modules/repofiles/temp_repo.go

* fix test

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: Lauris BH <lauris@nix.lv>
2020-10-14 07:49:33 +03:00
..
action.go Move all push update operations to a queue (#10133) 2020-09-11 10:14:48 -04:00
action_test.go Move all push update operations to a queue (#10133) 2020-09-11 10:14:48 -04:00
blob.go Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
blob_test.go prefer NoError/Error over Nil/NotNil (#12271) 2020-07-19 12:53:40 +03:00
commit.go Number of commits ahead/behind in branch overview (#6695) 2019-05-05 19:25:25 +03:00
commit_status.go Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
content.go Fix GetContents(): Dont't ignore Executables (#11192) 2020-04-24 19:20:22 +03:00
content_test.go prefer NoError/Error over Nil/NotNil (#12271) 2020-07-19 12:53:40 +03:00
delete.go Add configurable Trust Models (#11712) 2020-09-20 00:44:55 +08:00
diff.go Move git diff codes from models to services/gitdiff (#7889) 2019-09-05 22:20:09 -04:00
diff_test.go prefer NoError/Error over Nil/NotNil (#12271) 2020-07-19 12:53:40 +03:00
file.go File Edit: Author/Committer interchanged [BugFix] (#9297) 2019-12-09 21:11:24 +08:00
file_test.go prefer NoError/Error over Nil/NotNil (#12271) 2020-07-19 12:53:40 +03:00
repofiles.go Fixes 4762 - Content API for Creating, Updating, Deleting Files (#6314) 2019-04-17 12:06:35 -04:00
repofiles_test.go Fixes 4762 - Content API for Creating, Updating, Deleting Files (#6314) 2019-04-17 12:06:35 -04:00
temp_repo.go Finally fix diff names (#13136) 2020-10-14 07:49:33 +03:00
tree.go fixed bug in GitTreeBySHA where pulling items from a page other than page 1 would fail because the wrong var was used to set the entries to return (#9459) 2019-12-22 00:16:21 +00:00
tree_test.go prefer NoError/Error over Nil/NotNil (#12271) 2020-07-19 12:53:40 +03:00
update.go [Enhancement] Allow admin to merge pr with protected file changes (#12078) 2020-10-13 14:50:57 -04:00
upload.go LFS support to be stored on minio (#12518) 2020-09-08 23:45:10 +08:00
verification.go Sign merges, CRUD, Wiki and Repository initialisation with gpg key (#7631) 2019-10-16 14:42:42 +01:00