From 4cd8bb146ffe0bee0ef5f2b4e3356dc58274e1a6 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Mon, 25 May 2026 12:13:16 -0700
Subject: [PATCH 1/4] Use `ci-org-and-branch` instead of `ci-info`

---
 .azure/azure-pipelines.yml    | 4 ++--
 .azure/azure-pipelines.yml.m4 | 4 ++--
 .github/workflows/ci.yml      | 6 +++---
 .github/workflows/ci.yml.m4   | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml
index d0a6278a25560..6c1a142eb0ed1 100644
--- a/.azure/azure-pipelines.yml
+++ b/.azure/azure-pipelines.yml
@@ -79,7 +79,7 @@ jobs:
       - bash: |
           git config --global --add safe.directory $(cd ../jdk21u && pwd)
           cd ../jdk21u && git status
-          eval $(/tmp/$USER/plume-scripts/ci-info typetools)
+          eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
           set
           echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
         displayName: git merge plan
@@ -92,7 +92,7 @@ jobs:
           git config --global core.longpaths true
           git config --global core.protectNTFS false
           cd ../jdk21u && git status
-          eval $(/tmp/$USER/plume-scripts/ci-info typetools)
+          eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
           set
           echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
           cd ../jdk21u && git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME} || (git --version && git show | head -100 && git status && git diff | head -1000 && echo "Merge failed; see 'Pull request merge conflicts' at https://github.com/typetools/jdk/blob/master/README.md " && false)
diff --git a/.azure/azure-pipelines.yml.m4 b/.azure/azure-pipelines.yml.m4
index 5e1d4c8e38af0..fb878ceafc54b 100644
--- a/.azure/azure-pipelines.yml.m4
+++ b/.azure/azure-pipelines.yml.m4
@@ -82,7 +82,7 @@ jobs:
       - bash: |
           git config --global --add safe.directory $(cd ../jdk21u && pwd)
           cd ../jdk21u && git status
-          eval $(/tmp/$USER/plume-scripts/ci-info typetools)
+          eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
           set
           echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
         displayName: git merge plan
@@ -95,7 +95,7 @@ jobs:
           git config --global core.longpaths true
           git config --global core.protectNTFS false
           cd ../jdk21u && git status
-          eval $(/tmp/$USER/plume-scripts/ci-info typetools)
+          eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
           set
           echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
           cd ../jdk21u && git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME} || (git --version && git show | head -100 && git status && git diff | head -1000 && echo "Merge failed; see 'Pull request merge conflicts' at https://github.com/typetools/jdk/blob/master/README.md " && false)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 57d44cb35f572..e35be06b06432 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -96,8 +96,8 @@ jobs:
         # Run `git-clone-related` without a limit on depth, because if the depth is
         # too small, the merge will fail.  Don't use "--filter=blob:none" because that
         # leads to "fatal: remote error:  filter 'combine' not supported".
-      - name: ci-info
-        run: /tmp/$USER/plume-scripts/ci-info --debug
+      - name: ci-org-and-branch
+        run: /tmp/$USER/plume-scripts/ci-org-and-branch --debug
       - name: clone-related-jdk21u
         run: |
           set -ex
@@ -116,7 +116,7 @@ jobs:
           set -ex
           cd ../jdk21u
           git status
-          eval $(/tmp/$USER/plume-scripts/ci-info typetools)
+          eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
           echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
           if ! git pull --no-edit "https://github.com/${CI_ORGANIZATION}/jdk" "${CI_BRANCH_NAME}"; then
             git --version
diff --git a/.github/workflows/ci.yml.m4 b/.github/workflows/ci.yml.m4
index 50210af2491f2..1f2bd7ff238ef 100644
--- a/.github/workflows/ci.yml.m4
+++ b/.github/workflows/ci.yml.m4
@@ -100,8 +100,8 @@ jobs:
         # Run `git-clone-related` without a limit on depth, because if the depth is
         # too small, the merge will fail.  Don't use "--filter=blob:none" because that
         # leads to "fatal: remote error:  filter 'combine' not supported".
-      - name: ci-info
-        run: /tmp/$USER/plume-scripts/ci-info --debug
+      - name: ci-org-and-branch
+        run: /tmp/$USER/plume-scripts/ci-org-and-branch --debug
       - name: clone-related-jdk21u
         run: |
           set -ex
@@ -120,7 +120,7 @@ jobs:
           set -ex
           cd ../jdk21u
           git status
-          eval $(/tmp/$USER/plume-scripts/ci-info typetools)
+          eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
           echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
           if ! git pull --no-edit "https://github.com/${CI_ORGANIZATION}/jdk" "${CI_BRANCH_NAME}"; then
             git --version

From f307e1f3ad6771cc753a64f1a67f8cd4088178d8 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Mon, 25 May 2026 13:26:21 -0700
Subject: [PATCH 2/4] Use diff3 style for merge conflicts

---
 .azure/azure-pipelines.yml    | 1 +
 .azure/azure-pipelines.yml.m4 | 1 +
 .github/workflows/ci.yml      | 1 +
 .github/workflows/ci.yml.m4   | 1 +
 4 files changed, 4 insertions(+)

diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml
index 6c1a142eb0ed1..a43690c68ba84 100644
--- a/.azure/azure-pipelines.yml
+++ b/.azure/azure-pipelines.yml
@@ -91,6 +91,7 @@ jobs:
           git config --global pull.rebase false
           git config --global core.longpaths true
           git config --global core.protectNTFS false
+          git config --global merge.conflictstyle diff3
           cd ../jdk21u && git status
           eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
           set
diff --git a/.azure/azure-pipelines.yml.m4 b/.azure/azure-pipelines.yml.m4
index fb878ceafc54b..e587e57622364 100644
--- a/.azure/azure-pipelines.yml.m4
+++ b/.azure/azure-pipelines.yml.m4
@@ -94,6 +94,7 @@ jobs:
           git config --global pull.rebase false
           git config --global core.longpaths true
           git config --global core.protectNTFS false
+          git config --global merge.conflictstyle diff3
           cd ../jdk21u && git status
           eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
           set
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e35be06b06432..e240d647395e6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -119,6 +119,7 @@ jobs:
           eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
           echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
           if ! git pull --no-edit "https://github.com/${CI_ORGANIZATION}/jdk" "${CI_BRANCH_NAME}"; then
+            git config --global merge.conflictstyle diff3
             git --version
             git show | head -100
             git status && git diff | head -1000
diff --git a/.github/workflows/ci.yml.m4 b/.github/workflows/ci.yml.m4
index 1f2bd7ff238ef..d22288e18e8fd 100644
--- a/.github/workflows/ci.yml.m4
+++ b/.github/workflows/ci.yml.m4
@@ -123,6 +123,7 @@ jobs:
           eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
           echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
           if ! git pull --no-edit "https://github.com/${CI_ORGANIZATION}/jdk" "${CI_BRANCH_NAME}"; then
+            git config --global merge.conflictstyle diff3
             git --version
             git show | head -100
             git status && git diff | head -1000

From 49d095fad391edbe9c6b51b88ebe9e07da22f3e6 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Mon, 25 May 2026 13:36:31 -0700
Subject: [PATCH 3/4] Reduce duplication in `git config` commands

---
 .github/workflows/ci.yml    | 3 +--
 .github/workflows/ci.yml.m4 | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e240d647395e6..10e86aa2b9875 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,6 +92,7 @@ jobs:
           git config --global core.longpaths true
           git config --global core.protectNTFS false
           git config --global --add safe.directory /__w/jdk/jdk
+          git config --global merge.conflictstyle diff3
         # This creates ../jdk21u .
         # Run `git-clone-related` without a limit on depth, because if the depth is
         # too small, the merge will fail.  Don't use "--filter=blob:none" because that
@@ -107,7 +108,6 @@ jobs:
             false
           fi
           df .
-          git config --global --add safe.directory /__w/jdk/jdk
           /tmp/$USER/git-scripts/git-clone-related typetools jdk21u ../jdk21u --single-branch
           cd ../jdk21u
           git diff --exit-code
@@ -119,7 +119,6 @@ jobs:
           eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
           echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
           if ! git pull --no-edit "https://github.com/${CI_ORGANIZATION}/jdk" "${CI_BRANCH_NAME}"; then
-            git config --global merge.conflictstyle diff3
             git --version
             git show | head -100
             git status && git diff | head -1000
diff --git a/.github/workflows/ci.yml.m4 b/.github/workflows/ci.yml.m4
index d22288e18e8fd..727556093d9b6 100644
--- a/.github/workflows/ci.yml.m4
+++ b/.github/workflows/ci.yml.m4
@@ -96,6 +96,7 @@ jobs:
           git config --global core.longpaths true
           git config --global core.protectNTFS false
           git config --global --add safe.directory /__w/jdk/jdk
+          git config --global merge.conflictstyle diff3
         # This creates ../jdk21u .
         # Run `git-clone-related` without a limit on depth, because if the depth is
         # too small, the merge will fail.  Don't use "--filter=blob:none" because that
@@ -111,7 +112,6 @@ jobs:
             false
           fi
           df .
-          git config --global --add safe.directory /__w/jdk/jdk
           /tmp/$USER/git-scripts/git-clone-related typetools jdk21u ../jdk21u --single-branch
           cd ../jdk21u
           git diff --exit-code
@@ -123,7 +123,6 @@ jobs:
           eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
           echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
           if ! git pull --no-edit "https://github.com/${CI_ORGANIZATION}/jdk" "${CI_BRANCH_NAME}"; then
-            git config --global merge.conflictstyle diff3
             git --version
             git show | head -100
             git status && git diff | head -1000

From aeceae072d26c1cc839b925c3189ebdaceb3f1b1 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Mon, 25 May 2026 17:44:08 -0700
Subject: [PATCH 4/4] Fix variable name

---
 .azure/azure-pipelines.yml    |  9 ++++-----
 .azure/azure-pipelines.yml.m4 |  9 ++++-----
 .github/workflows/ci.yml      | 14 +++++++++++---
 .github/workflows/ci.yml.m4   | 14 +++++++++++---
 4 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml
index a43690c68ba84..b8c08d3441109 100644
--- a/.azure/azure-pipelines.yml
+++ b/.azure/azure-pipelines.yml
@@ -79,9 +79,9 @@ jobs:
       - bash: |
           git config --global --add safe.directory $(cd ../jdk21u && pwd)
           cd ../jdk21u && git status
+          /tmp/$USER/plume-scripts/ci-org-and-branch typetools --debug
           eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
-          set
-          echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
+          echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH}"
         displayName: git merge plan
       - bash: |
           set -ex
@@ -94,9 +94,8 @@ jobs:
           git config --global merge.conflictstyle diff3
           cd ../jdk21u && git status
           eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
-          set
-          echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
-          cd ../jdk21u && git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME} || (git --version && git show | head -100 && git status && git diff | head -1000 && echo "Merge failed; see 'Pull request merge conflicts' at https://github.com/typetools/jdk/blob/master/README.md " && false)
+          echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH}"
+          cd ../jdk21u && git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH} || (git --version && git show | head -100 && git status && git diff | head -1000 && echo "Merge failed; see 'Pull request merge conflicts' at https://github.com/typetools/jdk/blob/master/README.md " && false)
         displayName: git merge
       - bash: cd ../jdk21u && export JT_HOME=/usr/share/jtreg && bash ./configure --with-jtreg --disable-warnings-as-errors
         displayName: configure
diff --git a/.azure/azure-pipelines.yml.m4 b/.azure/azure-pipelines.yml.m4
index e587e57622364..1dc0ed8481b98 100644
--- a/.azure/azure-pipelines.yml.m4
+++ b/.azure/azure-pipelines.yml.m4
@@ -82,9 +82,9 @@ jobs:
       - bash: |
           git config --global --add safe.directory $(cd ../jdk21u && pwd)
           cd ../jdk21u && git status
+          /tmp/$USER/plume-scripts/ci-org-and-branch typetools --debug
           eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
-          set
-          echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
+          echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH}"
         displayName: git merge plan
       - bash: |
           set -ex
@@ -97,9 +97,8 @@ jobs:
           git config --global merge.conflictstyle diff3
           cd ../jdk21u && git status
           eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
-          set
-          echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
-          cd ../jdk21u && git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME} || (git --version && git show | head -100 && git status && git diff | head -1000 && echo "Merge failed; see 'Pull request merge conflicts' at https://github.com/typetools/jdk/blob/master/README.md " && false)
+          echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH}"
+          cd ../jdk21u && git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH} || (git --version && git show | head -100 && git status && git diff | head -1000 && echo "Merge failed; see 'Pull request merge conflicts' at https://github.com/typetools/jdk/blob/master/README.md " && false)
         displayName: git merge
       - bash: cd ../jdk21u && export JT_HOME=/usr/share/jtreg && bash ./configure --with-jtreg --disable-warnings-as-errors
         displayName: configure
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 10e86aa2b9875..5f2599aa288d2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -111,14 +111,22 @@ jobs:
           /tmp/$USER/git-scripts/git-clone-related typetools jdk21u ../jdk21u --single-branch
           cd ../jdk21u
           git diff --exit-code
-      - name: git merge
+      - name: git merge plan
         run: |
           set -ex
           cd ../jdk21u
           git status
+          /tmp/$USER/plume-scripts/ci-org-and-branch typetools --debug
+          eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
+          echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH}"
+        shell: bash --noprofile --norc -e {0}
+      - name: git merge
+        run: |
+          set -ex
+          cd ../jdk21u
           eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
-          echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
-          if ! git pull --no-edit "https://github.com/${CI_ORGANIZATION}/jdk" "${CI_BRANCH_NAME}"; then
+          echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH}"
+          if ! git pull --no-edit "https://github.com/${CI_ORGANIZATION}/jdk" "${CI_BRANCH}"; then
             git --version
             git show | head -100
             git status && git diff | head -1000
diff --git a/.github/workflows/ci.yml.m4 b/.github/workflows/ci.yml.m4
index 727556093d9b6..ed479aee79605 100644
--- a/.github/workflows/ci.yml.m4
+++ b/.github/workflows/ci.yml.m4
@@ -115,14 +115,22 @@ jobs:
           /tmp/$USER/git-scripts/git-clone-related typetools jdk21u ../jdk21u --single-branch
           cd ../jdk21u
           git diff --exit-code
-      - name: git merge
+      - name: git merge plan
         run: |
           set -ex
           cd ../jdk21u
           git status
+          /tmp/$USER/plume-scripts/ci-org-and-branch typetools --debug
+          eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
+          echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH}"
+        shell: bash --noprofile --norc -e {0}
+      - name: git merge
+        run: |
+          set -ex
+          cd ../jdk21u
           eval $(/tmp/$USER/plume-scripts/ci-org-and-branch typetools)
-          echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
-          if ! git pull --no-edit "https://github.com/${CI_ORGANIZATION}/jdk" "${CI_BRANCH_NAME}"; then
+          echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH}"
+          if ! git pull --no-edit "https://github.com/${CI_ORGANIZATION}/jdk" "${CI_BRANCH}"; then
             git --version
             git show | head -100
             git status && git diff | head -1000