diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml
index 6f78e2fca741f..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
-          eval $(/tmp/$USER/plume-scripts/ci-info typetools)
-          set
-          echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
+          /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}"
         displayName: git merge plan
       - bash: |
           set -ex
@@ -93,10 +93,9 @@ jobs:
           git config --global core.protectNTFS false
           git config --global merge.conflictstyle diff3
           cd ../jdk21u && git status
-          eval $(/tmp/$USER/plume-scripts/ci-info 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)
+          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}"
+          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 ea06a786c40ab..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
-          eval $(/tmp/$USER/plume-scripts/ci-info typetools)
-          set
-          echo "About to run: git pull --no-edit https://github.com/${CI_ORGANIZATION}/jdk ${CI_BRANCH_NAME}"
+          /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}"
         displayName: git merge plan
       - bash: |
           set -ex
@@ -96,10 +96,9 @@ jobs:
           git config --global core.protectNTFS false
           git config --global merge.conflictstyle diff3
           cd ../jdk21u && git status
-          eval $(/tmp/$USER/plume-scripts/ci-info 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)
+          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}"
+          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 0aa1dd43150c0..5f2599aa288d2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,12 +92,13 @@ 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
         # 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
@@ -107,20 +108,25 @@ jobs:
             false
           fi
           df .
-          git config --global --add safe.directory /__w/jdk/jdk
-          git config --global merge.conflictstyle diff3
           /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
-          eval $(/tmp/$USER/plume-scripts/ci-info 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
+          /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}"
+          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 8ea0a23ddc9f2..ed479aee79605 100644
--- a/.github/workflows/ci.yml.m4
+++ b/.github/workflows/ci.yml.m4
@@ -96,12 +96,13 @@ 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
         # 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
@@ -111,20 +112,25 @@ jobs:
             false
           fi
           df .
-          git config --global --add safe.directory /__w/jdk/jdk
-          git config --global merge.conflictstyle diff3
           /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
-          eval $(/tmp/$USER/plume-scripts/ci-info 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
+          /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}"
+          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