File tree Expand file tree Collapse file tree 2 files changed +6
-3
lines changed Expand file tree Collapse file tree 2 files changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -1714,6 +1714,7 @@ pulls.select_commit_hold_shift_for_range = Select commit. Hold shift + click to
17141714pulls.review_only_possible_for_full_diff = Review is only possible when viewing the full diff
17151715pulls.filter_changes_by_commit = Filter by commit
17161716pulls.nothing_to_compare = These branches are equal. There is no need to create a pull request.
1717+ pulls.nothing_to_compare_have_tag = The selected branch/tag are equal.
17171718pulls.nothing_to_compare_and_allow_empty_pr = These branches are equal. This PR will be empty.
17181719pulls.has_pull_request = `A pull request between these branches already exists: <a href =" %[1]s" >%[2]s# %[3]d</a>`
17191720pulls.create = Create Pull Request
Original file line number Diff line number Diff line change 177177 </div>
178178
179179 {{if .IsNothingToCompare}}
180- {{if and $.IsSigned $.AllowEmptyPr (not .Repository.IsArchived)}}
180+ {{if and $.IsSigned $.AllowEmptyPr (not .Repository.IsArchived) .PageIsComparePull }}
181181 <div class="ui segment">{{ctx.Locale.Tr "repo.pulls.nothing_to_compare_and_allow_empty_pr"}}</div>
182182 <div class="ui info message show-form-container {{if .Flash}}gt-hidden{{end}}">
183183 <button class="ui button primary show-form">{{ctx.Locale.Tr "repo.pulls.new"}}</button>
184184 </div>
185185 <div class="pullrequest-form {{if not .Flash}}gt-hidden{{end}}">
186186 {{template "repo/issue/new_form" .}}
187187 </div>
188- {{else}}
188+ {{else if and .HeadIsBranch .BaseIsBranch }}
189189 <div class="ui segment">{{ctx.Locale.Tr "repo.pulls.nothing_to_compare"}}</div>
190+ {{else}}
191+ <div class="ui segment">{{ctx.Locale.Tr "repo.pulls.nothing_to_compare_have_tag"}}</div>
190192 {{end}}
191193 {{else if and .PageIsComparePull (gt .CommitCount 0)}}
192194 {{if .HasPullRequest}}
229231 {{end}}
230232 {{$showDiffBox = true}}
231233 {{end}}
232- {{else}}
234+ {{else if not .IsNothingToCompare }}
233235 {{$showDiffBox = true}}
234236 {{end}}
235237 </div>
You can’t perform that action at this time.
0 commit comments