mirror of https://github.com/go-gitea/gitea.git
Backport #24133 by @jtran For 2-dot direct compare, we should use the base commit in the title and templates, as is used elsewhere, not the common ancestor which is used for 3-dot compare. I believe that this change should have been included in #22949. Co-authored-by: Jonathan Tran <jonnytran@gmail.com>
This commit is contained in:
parent
10f93995e9
commit
494e373292
|
@ -551,7 +551,11 @@ func ParseCompareInfo(ctx *context.Context) *CompareInfo {
|
|||
ctx.ServerError("GetCompareInfo", err)
|
||||
return nil
|
||||
}
|
||||
ctx.Data["BeforeCommitID"] = ci.CompareInfo.MergeBase
|
||||
if ci.DirectComparison {
|
||||
ctx.Data["BeforeCommitID"] = ci.CompareInfo.BaseCommitID
|
||||
} else {
|
||||
ctx.Data["BeforeCommitID"] = ci.CompareInfo.MergeBase
|
||||
}
|
||||
|
||||
return ci
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue