Fix initial commit page & binary munching problem #13249
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Unfortunately as a result of properly fixing ParsePatch the hack that used git show <initial_commit_id> to get the diff for this failed. This PR fixes this using the "super-secret" empty tree ref to make the diff against. Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath
changed the title
GiteaBot
added
the
lgtm/need 2
lafriks
reviewed
Oct 21, 2020
| if len(whitespaceBehavior) != 0 { | ||
| diffArgs = append(diffArgs, whitespaceBehavior) | ||
| } | ||
| diffArgs = append(diffArgs, "4b825dc642cb6eb9a060e54bf8d69288fbee4904") |
There was a problem hiding this comment.
This probably should be beforeCommitID?
There was a problem hiding this comment.
Nope. That is the beforecommitid in this case
The commit has no parent so we use the magic empty tree ref.
Believe it or not this is what git uses internally to generate the "diff" on the git show in cases where the commit has no parents
There was a problem hiding this comment.
We can't set this as the beforecommitid as it breaks other things lower down in the function.
Codecov Report
@@ Coverage Diff @@
## master #13249 +/- ##
==========================================
+ Coverage 42.21% 42.22% +0.01%
==========================================
Files 683 683
Lines 75458 75463 +5
==========================================
+ Hits 31851 31866 +15
+ Misses 38382 38375 -7
+ Partials 5225 5222 -3
Continue to review full report at Codecov.
|
6543
reviewed
Oct 21, 2020
mrsdizzie
approved these changes
Oct 21, 2020
GiteaBot
added
lgtm/need 1
Co-authored-by: 6543 <6543@obermui.de>
6543
approved these changes
Oct 21, 2020
GiteaBot
added
lgtm/done
|
sorry about that ^, will not reference PRs in this manner anymore, unless necessary ofc 🚀 |
|
please send backports :) |
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Oct 22, 2020
Backport go-gitea#13249 * Fix initial commit page Unfortunately as a result of properly fixing ParsePatch the hack that used git show <initial_commit_id> to get the diff for this failed. This PR fixes this using the "super-secret" empty tree ref to make the diff against. Signed-off-by: Andrew Thornton <art27@cantab.net> * Also fix go-gitea#13248 Signed-off-by: Andrew Thornton <art27@cantab.net> * Update services/gitdiff/gitdiff.go Co-authored-by: 6543 <6543@obermui.de>
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Oct 22, 2020
Backport go-gitea#13249 * Fix initial commit page Unfortunately as a result of properly fixing ParsePatch the hack that used git show <initial_commit_id> to get the diff for this failed. This PR fixes this using the "super-secret" empty tree ref to make the diff against. Signed-off-by: Andrew Thornton <art27@cantab.net> * Also fix go-gitea#13248 Signed-off-by: Andrew Thornton <art27@cantab.net> * Update services/gitdiff/gitdiff.go Co-authored-by: 6543 <6543@obermui.de>
zeripath
added a commit
that referenced
this pull request
Oct 22, 2020
Backport #13249 * Fix initial commit page Unfortunately as a result of properly fixing ParsePatch the hack that used git show <initial_commit_id> to get the diff for this failed. This PR fixes this using the "super-secret" empty tree ref to make the diff against. Signed-off-by: Andrew Thornton <art27@cantab.net> * Also fix #13248 Signed-off-by: Andrew Thornton <art27@cantab.net> * Update services/gitdiff/gitdiff.go Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: 6543 <6543@obermui.de>
zeripath
added a commit
that referenced
this pull request
Oct 22, 2020
Backport #13249 * Fix initial commit page Unfortunately as a result of properly fixing ParsePatch the hack that used git show <initial_commit_id> to get the diff for this failed. This PR fixes this using the "super-secret" empty tree ref to make the diff against. Signed-off-by: Andrew Thornton <art27@cantab.net> * Also fix #13248 Signed-off-by: Andrew Thornton <art27@cantab.net> * Update services/gitdiff/gitdiff.go Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: 6543 <6543@obermui.de>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes two issues:
There was a missing check to break out of the current file loop in ParsePatch
Fix #13248
Unfortunately as a result of properly fixing ParsePatch the hack that
used git show <initial_commit_id> to get the diff for this failed.
This PR fixes this using the "super-secret" empty tree ref to make the
diff against.
Signed-off-by: Andrew Thornton art27@cantab.net