Skip to content

fix(autofix): unconditionally restore tracked files before branch checkout (#6281) #6286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wenshao merged 1 commit into from
Jul 3, 2026
Merged

fix(autofix): unconditionally restore tracked files before branch checkout (#6281) #6286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/workflows/qwen-autofix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,11 +1006,9 @@ jobs:
GITHUB_TOKEN: '${{ secrets.CI_DEV_BOT_PAT }}'
run: |-
mkdir -p "${WORKDIR}"
if ! git diff --quiet || ! git diff --cached --quiet; then
echo 'Restoring tracked build output before switching to the PR branch.'
git status --short
git restore --source=HEAD --staged --worktree .
fi
echo 'Restoring tracked build output before switching to the PR branch.'
git status --short
git restore --source=HEAD --staged --worktree .
git checkout -B "${BRANCH}" "origin/${BRANCH}"

# Does the branch conflict with base? merge-tree computes the merge
Expand Down
1 change: 1 addition & 0 deletions scripts/tests/qwen-autofix-workflow.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@ describe('qwen-autofix workflow', () => {
),
);
expect(prepareBranchAndFeedbackStep).not.toContain('git clean');
expect(prepareBranchAndFeedbackStep).not.toContain('git diff --quiet');
});

it('clears persistent autofix workdirs before agent steps run', () => {
Expand Down
Loading