Skip to content

update verify logic and test case for merge-undo#273

Merged
jovnc merged 7 commits intogit-mastery:mainfrom
SAN-MUYUN:enhancement/merge-undo
Mar 18, 2026
Merged

update verify logic and test case for merge-undo#273
jovnc merged 7 commits intogit-mastery:mainfrom
SAN-MUYUN:enhancement/merge-undo

Conversation

@SAN-MUYUN
Copy link
Copy Markdown
Contributor

Exercise Review

Exercise Discussion

#269

Removed the unnecessary check that enforces students to be on main branch when running verify.

Checklist

  • If you require a new remote repository on the Git-Mastery organization, have you created a request for it?
  • Have you written unit tests using repo-smith to validate the exercise grading scheme?
  • Have you tested your changes using the instructions posted?
  • Have you verified that this exercise does not already exist or is not currently in review?
  • Did you introduce a new grading mechanism that should belong to git-autograder?
  • Did you introduce a new dependency that should belong to app?

@github-actions
Copy link
Copy Markdown

Hi @SAN-MUYUN, thank you for your contribution! 🎉

This PR comes from your fork SAN-MUYUN/git-mastery-exercises on branch enhancement/merge-undo.

Before you request for a review, please ensure that you have tested your changes locally!

Important

The previously recommended way of using ./test-download.py is no longer the best way to test your changes locally.

Please read the following instructions for the latest instructions.

Prerequisites

Ensure that you have the gitmastery app installed locally (instructions)

Testing steps

If you already have a local Git-Mastery root to test, you can skip the following step.

Create a Git-Mastery root locally:

gitmastery setup

Navigate into the Git-Mastery root (defaults to gitmastery-exercises/):

cd gitmastery-exercises/

Edit the .gitmastery.json configuration file. You need to set the following values under the exercises_source key.

{
    # other fields...
    "exercises_source": {
        "username": "SAN-MUYUN",
        "repository": "git-mastery-exercises",
        "branch": "enhancement/merge-undo"
    }
}

Then, you can use the gitmastery app to download and verify your changes locally.

gitmastery download <your new change>
gitmastery verify

Checklist

  • (For exercises and hands-ons) I have verified that the downloading behavior works
  • (For exercises only) I have verified that the verification behavior is accurate

Important

To any reviewers of this pull request, please use the same instructions above to test the changes.

Copy link
Copy Markdown
Contributor

@desmondwong1215 desmondwong1215 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just some small nits to be fixed. Overall, LGTM!

"You aren't currently on the main branch. Checkout to that branch and try again!"
)
DETACHED_HEAD = "You should not be in a detached HEAD state! Use git checkout main to get back to main"
MAIN_BRANCH_MISSING = "Main branch is missing, you can reset the exercises if needed and try again."
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to have duplicate message with RESET_MESSAGE.


main_branch = exercise.repo.branches.branch("main")
if not main_branch:
raise exercise.wrong_answer([MAIN_BRANCH_MISSING, RESET_MESSAGE])
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

User will see duplicate message at here.

)


def test_not_main():
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will it be better if we rename it to test_main_missing.

@jovnc jovnc merged commit 36a8faa into git-mastery:main Mar 18, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants