Skip to content

Commit 899516a

Browse files
sjarmakclaude
andcommitted
fix: add git init to 38 Dockerfile.sg_only files + update selection file for SDLC renames
Three fixes in this commit: 1. Add `git init -b main` to 38 Dockerfile.sg_only files that use `COPY repo` (not `git clone`). Without git init, the COPY creates a plain directory and `git add -A && git commit` fails with exit code 128. This was the root cause of all 7 broken MCP reruns (cgen-deps-install-001 + 6 ccb_test tasks). 2. Update selected_benchmark_tasks.json for 4 SDLC suites (debug, design, fix, secure = 85 tasks) whose task_dir values referenced old task names from before the SDLC phase reorganization. The on-disk directories use new descriptive names (e.g., navprove-qb-tab-001 → qutebrowser-tab-regression-prove-001). 3. Add rerun scripts: rerun_7_broken_mcp.sh (MCP-only for git-config-bug tasks) and rerun_remaining_suites.sh (4 suites that didn't launch in original batch). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent ebca796 commit 899516a

File tree

41 files changed

+1706
-2223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1706
-2223
lines changed

benchmarks/ccb_build/bustub-hyperloglog-impl-001/environment/Dockerfile.sg_only

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ RUN find /workspace -type f \( -name "*.py" -o -name "*.pyx" -o -name "*.pyi" -o
2222
# Recommit truncated state so git history cannot recover full files.
2323
# Without this, `git show HEAD:<file>` or `git checkout HEAD -- <file>`
2424
# would bypass truncation by reading from the pre-truncation commit.
25-
RUN cd /workspace && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
25+
RUN cd /workspace && git init -b main && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
2626
RUN touch /tmp/.sg_only_mode && echo '/workspace' > /tmp/.sg_only_workdir
2727
CMD ["bash"]

benchmarks/ccb_build/cgen-deps-install-001/environment/Dockerfile.sg_only

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN find /app/repo -type f \( -name "*.py" -o -name "*.pyx" -o -name "*.pyi" -o
2222
# Recommit truncated state so git history cannot recover full files.
2323
# Without this, `git show HEAD:<file>` or `git checkout HEAD -- <file>`
2424
# would bypass truncation by reading from the pre-truncation commit.
25-
RUN cd /app/repo && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
25+
RUN cd /app/repo && git init -b main && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
2626
RUN touch /tmp/.sg_only_mode && echo '/app/repo' > /tmp/.sg_only_workdir
2727

2828
WORKDIR /app/repo

benchmarks/ccb_build/codecoverage-deps-install-001/environment/Dockerfile.sg_only

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN find /app/repo -type f \( -name "*.py" -o -name "*.pyx" -o -name "*.pyi" -o
2626
# Recommit truncated state so git history cannot recover full files.
2727
# Without this, `git show HEAD:<file>` or `git checkout HEAD -- <file>`
2828
# would bypass truncation by reading from the pre-truncation commit.
29-
RUN cd /app/repo && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
29+
RUN cd /app/repo && git init -b main && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
3030
RUN touch /tmp/.sg_only_mode && echo '/app/repo' > /tmp/.sg_only_workdir
3131

3232
WORKDIR /app/repo

benchmarks/ccb_build/dotenv-expand-deps-install-001/environment/Dockerfile.sg_only

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN find /app/repo -type f \( -name "*.py" -o -name "*.pyx" -o -name "*.pyi" -o
2424
# Recommit truncated state so git history cannot recover full files.
2525
# Without this, `git show HEAD:<file>` or `git checkout HEAD -- <file>`
2626
# would bypass truncation by reading from the pre-truncation commit.
27-
RUN cd /app/repo && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
27+
RUN cd /app/repo && git init -b main && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
2828
RUN touch /tmp/.sg_only_mode && echo '/app/repo' > /tmp/.sg_only_workdir
2929

3030
WORKDIR /app/repo

benchmarks/ccb_build/dotnetkoans-deps-install-001/environment/Dockerfile.sg_only

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN find /app/repo -type f \( -name "*.py" -o -name "*.pyx" -o -name "*.pyi" -o
2626
# Recommit truncated state so git history cannot recover full files.
2727
# Without this, `git show HEAD:<file>` or `git checkout HEAD -- <file>`
2828
# would bypass truncation by reading from the pre-truncation commit.
29-
RUN cd /app/repo && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
29+
RUN cd /app/repo && git init -b main && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
3030
RUN touch /tmp/.sg_only_mode && echo '/app/repo' > /tmp/.sg_only_workdir
3131

3232
WORKDIR /app/repo

benchmarks/ccb_build/eslint-markdown-deps-install-001/environment/Dockerfile.sg_only

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN find /app/repo -type f \( -name "*.py" -o -name "*.pyx" -o -name "*.pyi" -o
2424
# Recommit truncated state so git history cannot recover full files.
2525
# Without this, `git show HEAD:<file>` or `git checkout HEAD -- <file>`
2626
# would bypass truncation by reading from the pre-truncation commit.
27-
RUN cd /app/repo && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
27+
RUN cd /app/repo && git init -b main && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
2828
RUN touch /tmp/.sg_only_mode && echo '/app/repo' > /tmp/.sg_only_workdir
2929

3030
WORKDIR /app/repo

benchmarks/ccb_build/iamactionhunter-deps-install-001/environment/Dockerfile.sg_only

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN find /app/repo -type f \( -name "*.py" -o -name "*.pyx" -o -name "*.pyi" -o
2222
# Recommit truncated state so git history cannot recover full files.
2323
# Without this, `git show HEAD:<file>` or `git checkout HEAD -- <file>`
2424
# would bypass truncation by reading from the pre-truncation commit.
25-
RUN cd /app/repo && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
25+
RUN cd /app/repo && git init -b main && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
2626
RUN touch /tmp/.sg_only_mode && echo '/app/repo' > /tmp/.sg_only_workdir
2727

2828
WORKDIR /app/repo

benchmarks/ccb_build/pcap-parser-deps-install-001/environment/Dockerfile.sg_only

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN find /app/repo -type f \( -name "*.py" -o -name "*.pyx" -o -name "*.pyi" -o
2424
# Recommit truncated state so git history cannot recover full files.
2525
# Without this, `git show HEAD:<file>` or `git checkout HEAD -- <file>`
2626
# would bypass truncation by reading from the pre-truncation commit.
27-
RUN cd /app/repo && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
27+
RUN cd /app/repo && git init -b main && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
2828
RUN touch /tmp/.sg_only_mode && echo '/app/repo' > /tmp/.sg_only_workdir
2929

3030
WORKDIR /app/repo

benchmarks/ccb_build/python-http-class-naming-refac-001/environment/Dockerfile.sg_only

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN find /workspace -type f \( -name "*.py" -o -name "*.pyx" -o -name "*.pyi" -o
1111
# Recommit truncated state so git history cannot recover full files.
1212
# Without this, `git show HEAD:<file>` or `git checkout HEAD -- <file>`
1313
# would bypass truncation by reading from the pre-truncation commit.
14-
RUN cd /workspace && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
14+
RUN cd /workspace && git init -b main && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
1515
RUN touch /tmp/.sg_only_mode && echo '/workspace' > /tmp/.sg_only_workdir
1616

1717
WORKDIR /workspace

benchmarks/ccb_build/similar-asserts-deps-install-001/environment/Dockerfile.sg_only

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN find /app/repo -type f \( -name "*.py" -o -name "*.pyx" -o -name "*.pyi" -o
2424
# Recommit truncated state so git history cannot recover full files.
2525
# Without this, `git show HEAD:<file>` or `git checkout HEAD -- <file>`
2626
# would bypass truncation by reading from the pre-truncation commit.
27-
RUN cd /app/repo && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
27+
RUN cd /app/repo && git init -b main && git config user.email "agent@example.com" && git config user.name "Agent" && git add -A && git commit -m "sg_only truncation" --allow-empty --quiet
2828
RUN touch /tmp/.sg_only_mode && echo '/app/repo' > /tmp/.sg_only_workdir
2929

3030
WORKDIR /app/repo

0 commit comments

Comments
 (0)