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

Fix git reset #3

Closed
wants to merge 1 commit into from
Closed

Fix git reset #3

wants to merge 1 commit into from

Conversation

AJahueyM
Copy link

@AJahueyM AJahueyM commented Dec 7, 2021

https://github.com/pkgconf/pkgconf uses tags instead of branches, reseting returns
"fatal: ambiguous argument 'origin/pkgconf-1.8.0': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git [...] -- [...]'" when folder already exists.

https://github.com/pkgconf/pkgconf uses tags instead of branches, reseting returns 
"fatal: ambiguous argument 'origin/pkgconf-1.8.0': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'" when folder already exists.
@sharkwouter
Copy link
Member

Wait, why is it using upstream pkgconf to begin with? We have our own: https://github.com/pspdev/psp-pkgconf

@AJahueyM
Copy link
Author

AJahueyM commented Dec 8, 2021

I don't know, you tell me Hahaha. While setting everything up I ran into this issue.

@fjtrujy
Copy link
Member

fjtrujy commented Dec 8, 2021

Because as far as I saw our changes in the fork aren't really needed. So I pointed to mainstream and upgraded to latest version

@sharkwouter
Copy link
Member

I think it solves this problem: pspdev/psp-packages#12 (comment)

But I'm tagging @carstene1ns to make sure.

@sharkwouter
Copy link
Member

sharkwouter commented Mar 31, 2022

I'm closing this as it is no longer relevant. We don't build pkgconf from source anymore.

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