Test-drive Tour 4

[damithc]

Similar to #154, but do after #167
Tour available at https://git-mastery.github.io/lessons/trail/usingRevisionHistory/

[jovnc]

Test Summary (Hands-on)

T4L1

hp-view-commits

• There should not be origin/main in the graph.
• Line 3 should be Add elderberries and figs into fruits.txt

T4L2

hp-add-tags

• Should be Add bananas instead of Insert figs into fruits.txt

hp-move-tags

• v1.0 tagged to wrong commit

Fixed in #196

hp-push-tags

• Issue with running gitmastery download hp-push-tags, the correct directory exists inside the exercises repository

Fixed

T4L3

hp-diff-changes usage 1

• Expected output differs from actual output (instead of a file for shapes, should be the shapes listed as shown)

hp-diff-changes usage 2

• Continuing from the previous hands-on (manual setup) leads to different results from the gitmastery download as they both use the same gitmastery download command but in usage 1, some changes were made to working directory (possibly do a git reset --hard HEAD here in manual setup)

• Expected output differs from actual output

hp-diff-changes usage 3

• All 3 given commands yields no results

T4L4

hp-checkout-commits

• Expected revision tree differs from actual revision tree

9970547 (HEAD -> main) shapes.txt: Add some shapes
1674d85 (tag: 1.0) colours.txt: Add some colours
7989f18 Update fruits list
1420c06 (tag: 0.9) Add colours.txt, shapes.txt
e479c15 Add elderberries and figs into fruits.txt
6130662 Add fruits.txt

• For step 2, it should be HEAD is now at 7989f18 Update fruits list
• For step 3, shapes.txt is still in the working directory and the expected revision tree should be as follows

For git log --oneline --decorate,

7989f18 (HEAD) Update fruits list
1420c06 (tag: 0.9) Add colours.txt, shapes.txt
e479c15 Add elderberries and figs into fruits.txt
6130662 Add fruits.txt

For git log --oneline --decorate --all,

9970547 (main) shapes.txt: Add some shapes
1420c06 (tag: 0.9) Add colours.txt, shapes.txt
1674d85 (tag: 1.0) colours.txt: Add some colours
7989f18 (HEAD) Update fruits list
e479c15 Add elderberries and figs into fruits.txt
6130662 Add fruits.txt

T4L5

hp-reset-commits

• manual setup differs from gitmastery download, the revision graph seems to suggest that the manual setup is correct (refer to [Hands-On Discussion] T4L5/hp-reset-commits (Resetting to past commits) #107 for the gitmastery download setup)

hp-force-push

• expected revision graph differs from the actual revision graph

* 95ede6f (HEAD -> main) Add drinks.txt
| * d086f15 (origin/main) shapes.txt: Add some shapes
|/  
* 01472c4 colours.txt: Add some colours
* 4d6714c Update fruits list
* 55be601 Add colours.txt, shapes.txt
* fb8d75d Add elderberries and figs into fruits.txt
* 16cad65 Add fruits.txt

• should be error: failed to push some refs to 'https://github.com/.../gitmastery-samplerepo-things.git'

T4L6

hp-revert-commit

• suggestion: tell students to run git log --oneline --decorate to show the revert commit being made

[jovnc]

Test Summary (EX)

T4L1

view-commits

• Question in answer.txt does not match verify.py logic, resulting in errors

Fixed in #196

T4L2

tags-push

Some issues with the auto-grading, tags v1.0 and v2.0 are present but still shown as missing.

@VikramGoyal23 Can you help to resolve this?

T4L3

sensors-diff

8890 should not be shown in git diff, but shown due to extra line

Fixed in #196

We can improve the answers.txt template to use bullet points instead of the current setup, as students might not be aware to use bullet points if there are multiple answers.

Fixed in #196

T4L4

sensors-checkout

answers.txt file is not created after running gitmastery download sensors-checkout

Fixed in #196

T4L6

sensors-revert

Feedback from auto-grading can be improved, perhaps we can tell users specifically which commits have not been reverted? The message seems to be very generic now, ie. same message for no revert vs. after reverting Jan 14 commit. Perhaps it would be better if we tell users specifically which commits have they not reverted yet?

@VikramGoyal23 Can you help to resolve this?

[damithc]

@jovnc Thanks very much for testing this tour meticulously.

T4L1

hp-view-commits

• There should not be origin/main in the graph.
• Line 3 should be Add elderberries and figs into fruits.txt

This, and a few other discrepancies, are due to the things that was in earlier tours (and was used to write the lesson content) was slightly different from the one created by the hands-on download script. In this case, I've updated the lesson to remove the option of using the things repo created earlier, and updated the content to match the one created by the download script.

T4L2

hp-add-tags

• Should be Add bananas instead of Insert figs into fruits.txt

Fixed.

T4L3

hp-diff-changes usage 1

• Expected output differs from actual output (instead of a file for shapes, should be the shapes listed as shown)

Fixed. Swapped this with usage 2 for a better flow between hands on practicals.

hp-diff-changes usage 2

• Continuing from the previous hands-on (manual setup) leads to different results from the gitmastery download as they both use the same gitmastery download command but in usage 1, some changes were made to working directory (possibly do a git reset --hard HEAD here in manual setup)
• Expected output differs from actual output

Fixed by swapping the order of usage 1 and 2.

hp-diff-changes usage 3

• All 3 given commands yields no results

Updated the content to use a new repo altogether. Can you create a new HP hp-diff-files, to match the commands given under manual setup instructions?

T4L4

hp-checkout-commits

• Expected revision tree differs from actual revision tree

Fixed.

T4L5

hp-reset-commits

• manual setup differs from gitmastery download, the revision graph seems to suggest that the manual setup is correct (refer to [Hands-On Discussion] T4L5/hp-reset-commits (Resetting to past commits) #107 for the gitmastery download setup)

Updated manual instructions. Is that what you meant?

hp-force-push

• expected revision graph differs from the actual revision graph

Fixed.

T4L6

hp-revert-commit

• suggestion: tell students to run git log --oneline --decorate to show the revert commit being made

Fixed.

I assume nothing for me to do on the exercises side.
Let me know if I missed anything.

[jovnc]

@damithc Yup, the fix LGTM!

There's still some minor issues with hp-diff-files.

• Extra a in # staged changes to andy/history.txta
• In addition, I believe it should be git diff --staged -- list.txt based on the comment in the manual setup (only list.txt is staged but not committed)
• Last one should be git diff HEAD~1..HEAD -- list.txt as there are only 2 commits in the revision graph

Opened a PR here #198

[damithc]

• Extra a in # staged changes to andy/history.txta
• In addition, I believe it should be git diff --staged -- list.txt based on the comment in the manual setup (only list.txt is staged but not committed)

@jovnc Thanks for checking. Fixed.

• Last one should be git diff HEAD~1..HEAD -- list.txt as there are only 2 commits in the revision graph

I've added one more commit. Two feel too few.