Skip to content
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.

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

Fixed many fetch/pull issues on #1138 #1141

Merged
merged 2 commits into from
Apr 28, 2024
Merged

Fixed many fetch/pull issues on #1138 #1141

merged 2 commits into from
Apr 28, 2024

Conversation

juanmv94
Copy link
Contributor

No description provided.

Copy link

netlify bot commented Apr 25, 2024

Deploy Preview for xenodochial-hugle-b9ec84 ready!

Name Link
🔨 Latest commit d45c740
🔍 Latest deploy log https://app.netlify.com/sites/xenodochial-hugle-b9ec84/deploys/662d24e126d74f00089ac182
😎 Deploy Preview https://deploy-preview-1141--xenodochial-hugle-b9ec84.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@juanmv94
Copy link
Contributor Author

Need to make some little fix to my changes...

@juanmv94
Copy link
Contributor Author

Looks like all compilation issues are related to tests expecting different (incorrect) results that were addressed by the fixes. Tests might need corrections:

  • doesn't fetch if out of sync, but will update explicit dest if specified
    o/main gets updated after git fetch origin main:main but wasn't updated before correction

  • correctly resolves source during git fetch with params
    correctly resolves existing commits and updates
    doesn't let you fetch to main if you are checked out there
    Does unallowed git fetch origin foo^:blah

  • pulls to a new branch and then merges in that branch
    o/main gets updated after git pull origin main:bar but wasn't updated before correction

@pcottle
Copy link
Owner

pcottle commented Apr 26, 2024

Yeah I totally agree that we shouldn't teach the functionality here that doesnt work (hence why I redid the lesson), but I hesitate to actually break the functionality.

There might be others relying upon this for levels in gists or with hardcoded commands, and adding the validation code might break that :/

will think on this but it seems like a lower priority item compared to updating the lesson (which we did)

@pcottle
Copy link
Owner

pcottle commented Apr 28, 2024

Alrighty, looks like everything is passing! Appreciate all the updates here and the work @juanmv94 :)

Will merge and push

@pcottle pcottle merged commit b10a6f8 into pcottle:main Apr 28, 2024
5 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.

2 participants