Sep 11, 2025 · Sep 11, 2025 · Sep 11, 2025
diff --git a/__tests__/git.test.ts b/__tests__/git.test.ts
      expect(execute).toHaveBeenCalledTimes(17)
      expect(response).toBe(Status.SUCCESS)
    })

    it('should generate temporary branch name without forward slashes to avoid conflicts', async () => {
      Object.assign(action, {
        hostname: 'github.com',
        silent: false,
        folder: 'assets',
        branch: 'branch',
        token: '123',
        repositoryName: 'JamesIves/montezuma',
        pusher: {
          name: 'asd',
          email: 'as@cat'
        },
        isTest: TestFlag.HAS_CHANGED_FILES
      })

      await deploy(action)

      // Check that execute was called with a checkout command that doesn't contain forward slashes in branch name
      const executeCalls = (execute as jest.Mock).mock.calls
      const checkoutCall = executeCalls.find((call) =>
        call[0].includes('checkout -b') && call[0].includes('github-pages-deploy-action')
      )

      expect(checkoutCall).toBeDefined()
      // The branch name should contain 'github-pages-deploy-action-' (with hyphen, not slash)
      expect(checkoutCall[0]).toMatch(/github-pages-deploy-action-[a-z0-9]+/)
      // The branch name should NOT contain forward slashes
      expect(checkoutCall[0]).not.toMatch(/github-pages-deploy-action\//)
    })
  })
 })
diff --git a/src/git.ts b/src/git.ts
 export async function deploy(action: ActionInterface): Promise<Status> {
  const temporaryDeploymentDirectory =
    'github-pages-deploy-action-temp-deployment-folder'
  const temporaryDeploymentBranch = `github-pages-deploy-action/${Math.random()
  const temporaryDeploymentBranch = `github-pages-deploy-action-${Math.random()
    .toString(36)
    .substr(2, 9)}`
  const rsyncVersion = getRsyncVersion()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -469,5 +469,35 @@ describe('git', () => {
		expect(execute).toHaveBeenCalledTimes(17)
		expect(response).toBe(Status.SUCCESS)
		})

		it('should generate temporary branch name without forward slashes to avoid conflicts', async () => {
		Object.assign(action, {
		hostname: 'github.com',
		silent: false,
		folder: 'assets',
		branch: 'branch',
		token: '123',
		repositoryName: 'JamesIves/montezuma',
		pusher: {
		name: 'asd',
		email: 'as@cat'
		},
		isTest: TestFlag.HAS_CHANGED_FILES
		})

		await deploy(action)

		// Check that execute was called with a checkout command that doesn't contain forward slashes in branch name
		const executeCalls = (execute as jest.Mock).mock.calls
		const checkoutCall = executeCalls.find((call) =>
		call[0].includes('checkout -b') && call[0].includes('github-pages-deploy-action')
		)

		expect(checkoutCall).toBeDefined()
		// The branch name should contain 'github-pages-deploy-action-' (with hyphen, not slash)
		expect(checkoutCall[0]).toMatch(/github-pages-deploy-action-[a-z0-9]+/)
		// The branch name should NOT contain forward slashes
		expect(checkoutCall[0]).not.toMatch(/github-pages-deploy-action\//)
		})
		})
		})
Original file line number	Diff line number	Diff line change
Expand Up		@@ -108,7 +108,7 @@ export async function init(action: ActionInterface): Promise<void \| Error> {
		export async function deploy(action: ActionInterface): Promise<Status> {
		const temporaryDeploymentDirectory =
		'github-pages-deploy-action-temp-deployment-folder'
		const temporaryDeploymentBranch = `github-pages-deploy-action/${Math.random()
		const temporaryDeploymentBranch = `github-pages-deploy-action-${Math.random()
		.toString(36)
		.substr(2, 9)}`
		const rsyncVersion = getRsyncVersion()
Expand Down