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

mkpkg_binary-addons: don't checkout and create a new branch at the sa… #4657

Merged
merged 1 commit into from
Jan 31, 2016
Merged

mkpkg_binary-addons: don't checkout and create a new branch at the sa… #4657

merged 1 commit into from
Jan 31, 2016

Conversation

lrusak
Copy link
Contributor

@lrusak lrusak commented Jan 28, 2016

…me time

You can't checkout a branch and create a new branch at the same time. This only worked for git hashes.

So in the past you would be left with adsp.basic-.tar.xz

$ git checkout v0.2.0 -b ref-v0.2.0
fatal: Cannot update paths and switch to branch 'ref-v0.2.0' at the same time.
Did you intend to checkout 'v0.2.0' which can not be resolved as commit?

Separating the checkout into two lines fixes this issue.

Since kodi tells us either a git hash or a branch, this method works fine and is needed for when the branch jarvis addons anyways (which has already happened).

chewitt added a commit that referenced this pull request Jan 31, 2016
@chewitt chewitt merged commit b0e6e1f into OpenELEC:master Jan 31, 2016
@lrusak lrusak deleted the mkpkg_binary-addons-fix branch March 29, 2016 19:27
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.

None yet

2 participants