Implement T8L2/glossary-branch-pull by desmondwong1215 · Pull Request #242 · git-mastery/exercises

desmondwong1215 · 2026-01-20T01:46:01Z

Exercise Review

Exercise Discussion

Fixes #237

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?

…e-glossary-branch-pull

github-actions · 2026-01-20T01:46:17Z

Hi @desmondwong1215, thank you for your contribution! 🎉

This PR comes from your fork desmondwong1215/exercises on branch e-glossary-branch-pull.

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": "desmondwong1215",
        "repository": "exercises",
        "branch": "e-glossary-branch-pull"
    }
}

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.

VikramGoyal23 · 2026-01-20T02:27:58Z

@desmondwong1215 Can you indicate by mentioning us when this PR is ready for our review, as it seems you're still working on it? Another method you could use is to mark this PR as a draft until it's ready to be reviewed.

desmondwong1215 · 2026-01-20T03:21:20Z

Hi @VikramGoyal23, this PR is ready for review. Thanks

VikramGoyal23

Mostly LGTM. Just a nit and some minor changes to logic for now, while we wait on the update to repo-smith to support unit tests.

VikramGoyal23 · 2026-01-22T17:16:56Z

glossary_branch_pull/download.py

+
+    checkout("DEF", False, verbose)
+    run_command(["git", "reset", "--hard", "HEAD~1"], verbose)
+    create_or_update_file("e.txt", "documentation: Evidence that someone once cared.\n")


It is more idiomatic to use a multiline string here.

Suggested change

create_or_update_file("e.txt", "documentation: Evidence that someone once cared.\n")

create_or_update_file(

"e.txt",

"""

documentation: Evidence that someone once cared.

"""

)

glossary_branch_pull/verify.py

…e-glossary-branch-pull

jovnc · 2026-02-04T15:58:55Z

@VikramGoyal23 Let's get this merged soon

jovnc · 2026-02-06T13:42:33Z

@VikramGoyal23 Let's get this merged soon so tour 8 can be released to students

…e-glossary-branch-pull

VikramGoyal23

Some changes in verification logic are required, and I have a few nits, but otherwise it mostly LGTM.

VikramGoyal23 · 2026-02-06T14:14:15Z

glossary_branch_pull/download.py

+
+    checkout("DEF", False, verbose)
+    run_command(["git", "reset", "--hard", "HEAD~1"], verbose)
+    create_or_update_file("d.txt", "documentation: Evidence that someone once cared.\n")


It is more idiomatic to use a multiline string here.

Suggested change

create_or_update_file("d.txt", "documentation: Evidence that someone once cared.\n")

create_or_update_file(

"d.txt",

"""

documentation: Evidence that someone once cared.

"""

)

VikramGoyal23 · 2026-02-06T14:58:29Z

glossary_branch_pull/verify.py

+        try:
+            exercise.repo.repo.refs["origin/STU"]
+        except (IndexError, KeyError):
+            comments.append(BRANCH_NOT_TRACKING.format(branch="STU"))
+            pass 


This doesn't seem to work for checking if the branch is actually tracking, creating a new branch using the -b option also works. The reason for this is that it checks if the local branch and reference to the upstream (origin) branch exist, but not if the local tracks the upstream. Consider changing it back to the old version:

Suggested change

try:

exercise.repo.repo.refs["origin/STU"]

except (IndexError, KeyError):

comments.append(BRANCH_NOT_TRACKING.format(branch="STU"))

pass

stu_branch = repo.branches.branch("STU").branch

tracking = stu_branch.tracking_branch()

if not tracking or tracking.name != 'origin/STU':

comments.append(BRANCH_NOT_TRACKING.format(branch="STU"))

VikramGoyal23 · 2026-02-06T14:58:50Z

glossary_branch_pull/verify.py

+        try:
+            exercise.repo.repo.refs["origin/VWX"]
+        except (IndexError, KeyError):
+            comments.append(BRANCH_NOT_TRACKING.format(branch="VWX"))
+            pass 


See comment on STU branch checking.

VikramGoyal23 · 2026-02-06T15:10:02Z

glossary_branch_pull/verify.py

+        except (IndexError, KeyError):
+            comments.append(BRANCH_NOT_TRACKING.format(branch="ABC"))
+            pass 


See comment on STU branch checking.

VikramGoyal23 · 2026-02-06T15:10:13Z

glossary_branch_pull/verify.py

+        except (IndexError, KeyError):
+            comments.append(BRANCH_NOT_TRACKING.format(branch="DEF"))


See comment on STU branch checking.

VikramGoyal23

LGTM!

desmondwong1215 added 6 commits January 16, 2026 20:56

Implement download.py

032dc4a

Update README.md

4ae24d0

Implement setup logic

568337b

Implement verify logic

a52163f

Improve verify logic

2eddc7a

Merge branch 'main' of https://github.com/git-mastery/exercises into …

913d02b

…e-glossary-branch-pull

desmondwong1215 added 2 commits January 20, 2026 09:50

Remove resources

30b0750

Add wrong_answer

6e81193

desmondwong1215 marked this pull request as draft January 20, 2026 02:36

Fix bug

b5fe84c

desmondwong1215 marked this pull request as ready for review January 20, 2026 03:21

VikramGoyal23 self-requested a review January 21, 2026 01:48

VikramGoyal23 requested changes Jan 23, 2026

View reviewed changes

desmondwong1215 marked this pull request as draft January 26, 2026 15:09

jovnc changed the title ~~[Exercise: glossary-branch-pull] T8L2. Pulling Branches from a Remote~~ Implement T8L2/glossary-branch-pull Jan 27, 2026

desmondwong1215 added 6 commits January 28, 2026 21:31

Merge branch 'main' of https://github.com/git-mastery/exercises into …

54176d3

…e-glossary-branch-pull

Improve logic

375a2b8

Change e.txt to d.txt

e023ba2

Improve verify logic

190bc3a

Implement test_verify

1378c76

Change pull to fetch and merge

7d3c756

desmondwong1215 marked this pull request as ready for review February 1, 2026 09:29

VikramGoyal23 self-requested a review February 5, 2026 01:15

desmondwong1215 added 2 commits February 6, 2026 21:49

Merge branch 'main' of https://github.com/git-mastery/exercises into …

90436a1

…e-glossary-branch-pull

Change to clone_repo_with_gh

5e0bb35

VikramGoyal23 requested changes Feb 6, 2026

View reviewed changes

Improve verify logic

004ab7f

VikramGoyal23 approved these changes Feb 6, 2026

View reviewed changes

VikramGoyal23 merged commit e61be0b into git-mastery:main Feb 6, 2026
4 checks passed

desmondwong1215 deleted the e-glossary-branch-pull branch February 9, 2026 01:30

		except (IndexError, KeyError):
		comments.append(BRANCH_NOT_TRACKING.format(branch="DEF"))

Conversation

desmondwong1215 commented Jan 20, 2026

Exercise Review

Exercise Discussion

Checklist

Uh oh!

github-actions bot commented Jan 20, 2026

Prerequisites

Testing steps

Checklist

Uh oh!

VikramGoyal23 commented Jan 20, 2026

Uh oh!

desmondwong1215 commented Jan 20, 2026

Uh oh!

VikramGoyal23 left a comment

Choose a reason for hiding this comment

Uh oh!

VikramGoyal23 Jan 22, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jovnc commented Feb 4, 2026

Uh oh!

jovnc commented Feb 6, 2026

Uh oh!

VikramGoyal23 left a comment

Choose a reason for hiding this comment

Uh oh!

VikramGoyal23 Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

VikramGoyal23 Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

VikramGoyal23 Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

VikramGoyal23 Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

VikramGoyal23 Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

VikramGoyal23 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants