File tree Expand file tree Collapse file tree 1 file changed +3
-2
lines changed
Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -199,6 +199,7 @@ func prSelectorForCurrentBranch(branchConfig git.BranchConfig, baseRepo ghrepo.I
199199 }
200200 return prNumber , prHeadRef , nil
201201 }
202+
202203 var branchOwner string
203204 if branchConfig .PushRemoteURL != nil {
204205 // the branch merges from a remote specified by URL
@@ -225,8 +226,8 @@ func prSelectorForCurrentBranch(branchConfig git.BranchConfig, baseRepo ghrepo.I
225226 if branchOwner != "" {
226227 selector := prHeadRef
227228 if branchConfig .Push != "" {
228- // If we have a resolved push revision ref, we defer to that
229- selector = strings .TrimPrefix (branchConfig .Push , branchConfig .PushRemoteName + "/" )
229+ // If we have a resolved @{ push} revision ref, we defer to that
230+ selector = strings .TrimPrefix (branchConfig .Push , branchConfig .PushRemoteName + "/" ) // SUS
230231 } else if (branchConfig .RemotePushDefault == "upstream" || branchConfig .RemotePushDefault == "tracking" ) &&
231232 strings .HasPrefix (branchConfig .MergeRef , "refs/heads/" ) {
232233 selector = strings .TrimPrefix (branchConfig .MergeRef , "refs/heads/" )
You can’t perform that action at this time.
0 commit comments