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

Commit fetch means we can checkout fetch head #339

Merged
merged 2 commits into from
Jun 15, 2016

Conversation

sj26
Copy link
Member

@sj26 sj26 commented Jun 14, 2016

This also fixes a case where we build a branch or tag and put the symbolic ref name into both the branch and commit field (like #338).

sj26 added 2 commits June 14, 2016 16:52

Verified

This commit was signed with the committer’s verified signature.
snyk-bot Snyk bot
This also fixes a case where we build a branch or tag and put the
symbolic ref name into both the branch and commit field.
Between two builds I got, repeatedly:

    $ git submodule sync --recursive
    Synchronizing submodule url for 'submodule'
    $ git submodule update --init --recursive
    error: Your local changes to the following files would be overwritten by checkout:
        command
    Please commit your changes or stash them before you can switch branches.
    Aborting
    Unable to checkout '78f4fa2685f43c33771d702b3bbc5f7e238d1dc9' in submodule path 'submodule'

It seems the git clean wasn't enough and this required a force, which
fixed the issue on a subsequent run.
@keithpitt
Copy link
Contributor

🚀

@sj26 sj26 merged commit 1a46b5f into master Jun 15, 2016
@sj26 sj26 deleted the fix-symbolic-fetch-and-checkout branch June 15, 2016 01:49
@keithpitt
Copy link
Contributor

Whoops, found a regression in this. Will revert and we can fix up in another branch.

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