Fix git action priorities (#1488)

2026-06-12 21:57:35 +08:00
parent 736b2da1a2
commit 85fa38bdde
8 changed files with 71 additions and 52 deletions
@@ -326,6 +326,9 @@ function getPrimaryActionId(input: BuildGitActionsInput): GitActionId | null {
  if (canPull(input)) {
    return "pull";
  }
+  if (canPush(input)) {
+    return "push";
+  }
  if (canMergePr(input)) {
    return getDefaultDirectPullRequestMergeActionId(input);
  }
@@ -338,9 +341,6 @@ function getPrimaryActionId(input: BuildGitActionsInput): GitActionId | null {
  if (input.shipDefault === "pr" && canUsePullRequestActionAsShipDefault(input)) {
    return "pr";
  }
-  if (canPush(input)) {
-    return "push";
-  }
  if (!input.isOnBaseBranch && input.aheadCount > 0) {
    return "merge-branch";
  }