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

Add Fallback for Pulls Diff when missing commits #13216

Closed
6543 opened this issue Oct 20, 2020 · 2 comments · Fixed by #13218
Closed

Add Fallback for Pulls Diff when missing commits #13216

6543 opened this issue Oct 20, 2020 · 2 comments · Fixed by #13218
Labels
type/feature Completely new functionality. Can only be merged if feature freeze is not active.

Comments

@6543
Copy link
Member

6543 commented Oct 20, 2020 •
edited
Loading

if a pull was merged and the pull head branch ref got missing or point to commits who are missimg, use the merged-sha as fallback to generate the diff view

To Test:

  1. create repo A
  2. frok repo A to repo B
  3. backup bare repo A
  4. create feature branch on B and add some commits
  5. create pull from B to A & squash-merge
  6. clone A to local disk
  7. restore backup of A
  8. push local clone back to gitea

what I expect -> cliking on Files-Changed will show the diff based on merged-commit as fallback
@6543 6543 added the type/bug label Oct 20, 2020
zeripath added a commit to zeripath/gitea that referenced this issue Oct 20, 2020
@zeripath
When the git ref is unable to be found return broken pr
d082faa 
Fix go-gitea#13216

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath mentioned this issue Oct 20, 2020
Merged
@6543 6543 added type/feature Completely new functionality. Can only be merged if feature freeze is not active. and removed type/bug labels Oct 20, 2020
lunny pushed a commit that referenced this issue Oct 20, 2020
@zeripath
When the git ref is unable to be found return broken pr (#13218)
0aec2a2 
Fix #13216

Signed-off-by: Andrew Thornton <[email protected]>
@6543
Copy link
Member Author

6543 commented Oct 20, 2020

reopen as per comment on #13218

@6543 6543 reopened this Oct 20, 2020
zeripath added a commit to zeripath/gitea that referenced this issue Oct 25, 2020
@zeripath
When the git ref is unable to be found return broken pr (go-gitea#13218)
cdf6a39 
Backport go-gitea#13218

Fix go-gitea#13216

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath mentioned this issue Oct 25, 2020
Merged
techknowlogick pushed a commit that referenced this issue Oct 25, 2020
@zeripath
When the git ref is unable to be found return broken pr (#13218) (#13303
d795bfc 
)

Backport #13218

Fix #13216

Signed-off-by: Andrew Thornton <[email protected]>
@techknowlogick
Copy link
Member

closed per linked PR

@go-gitea go-gitea locked and limited conversation to collaborators Dec 14, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

When the git ref is unable to be found return broken pr zeripath/gitea
2 participants
@techknowlogick @6543