Skip to content

[branch-bender] Fix verify logic to allow retries #220

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
VikramGoyal23 merged 2 commits into from
Jan 7, 2026
Merged

[branch-bender] Fix verify logic to allow retries #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3990b13
[branch-bender] Fix verify logic to allow retries
jovnc Jan 6, 2026
a8cd87f
[branch-bender] Add reposmith test for special case of undo
jovnc Jan 6, 2026
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
12 changes: 12 additions & 0 deletions branch_bender/test_verify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,18 @@ def test_base():
assert_output(output, GitAutograderStatus.SUCCESSFUL)


def test_merge_undo_succeeds():
with base_setup() as (test, rs):
rs.git.merge("feature/login", no_ff=False)
rs.git.reset("HEAD~1", hard=True)
rs.git.merge("feature/login", no_ff=True)
rs.git.merge("feature/dashboard", no_ff=True)
rs.git.merge("feature/payments", no_ff=True)

output = test.run()
assert_output(output, GitAutograderStatus.SUCCESSFUL)


def test_ff_fails():
with base_setup() as (test, rs):
rs.git.merge("feature/login")
Expand Down
14 changes: 8 additions & 6 deletions branch_bender/verify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,26 +41,28 @@ def verify(exercise: GitAutograderExercise) -> GitAutograderOutput:
if len(merge_order) < 3:
raise exercise.wrong_answer([MISSING_MERGES])

if merge_order[0] != "feature/login":
# Use negative indexing to check the last 3 merges (most recent)
# This allows users to undo mistakes (e.g., reset --hard after accidental ff) and redo properly
if merge_order[-3] != "feature/login":
raise exercise.wrong_answer([FEATURE_LOGIN_MERGE_MISSING, RESET_MESSAGE])

if messages[0] == "Fast-forward":
if messages[-3] == "Fast-forward":
raise exercise.wrong_answer(
[NO_FAST_FORWARDING.format(branch_name="feature/login"), RESET_MESSAGE]
)

if merge_order[1] != "feature/dashboard":
if merge_order[-2] != "feature/dashboard":
raise exercise.wrong_answer([FEATURE_DASHBOARD_MERGE_MISSING, RESET_MESSAGE])

if messages[1] == "Fast-forward":
if messages[-2] == "Fast-forward":
raise exercise.wrong_answer(
[NO_FAST_FORWARDING.format(branch_name="feature/dashboard"), RESET_MESSAGE]
)

if merge_order[2] != "feature/payments":
if merge_order[-1] != "feature/payments":
raise exercise.wrong_answer([FEATURE_PAYMENTS_MERGE_MISSING, RESET_MESSAGE])

if messages[2] == "Fast-forward":
if messages[-1] == "Fast-forward":
raise exercise.wrong_answer(
[NO_FAST_FORWARDING.format(branch_name="feature/payments"), RESET_MESSAGE]
)
Expand Down