pull-requests: fixed source of changes to be using shadow repos if it exists.
- previous logic was flaved as the OR condition always used the main repo - in case of GIT push -f and rebase we lost commits in the repo resulting in problems of displaying versions of pull-requests.
This commit is contained in:
parent
248aa3500a
commit
a727f47925
1 changed files with 4 additions and 2 deletions
|
|
@ -487,7 +487,9 @@ class RepoPullRequestsView(RepoAppView, DataGridAppView):
|
|||
log.debug('Failed to get shadow repo', exc_info=True)
|
||||
# try first the existing source_repo, and then shadow
|
||||
# repo if we can obtain one
|
||||
commits_source_repo = source_scm or shadow_scm
|
||||
commits_source_repo = source_scm
|
||||
if shadow_scm:
|
||||
commits_source_repo = shadow_scm
|
||||
|
||||
c.commits_source_repo = commits_source_repo
|
||||
c.ancestor = None # set it to None, to hide it from PR view
|
||||
|
|
@ -617,7 +619,7 @@ class RepoPullRequestsView(RepoAppView, DataGridAppView):
|
|||
diffset = cached_diff['diff']
|
||||
else:
|
||||
diffset = self._get_range_diffset(
|
||||
source_scm, source_repo,
|
||||
commits_source_repo, source_repo,
|
||||
commit1, commit2, diff_limit, file_limit,
|
||||
c.fulldiff, ign_whitespace_lcl, context_lcl
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue