Giter Site home page Giter Site logo

Comments (10)

karalabe avatar karalabe commented on August 26, 2024

Hrm, seems some new feature of git and/or github. I've also hit in locally on my machine but didn't know that xgo was also broken because of it. I'll look into it. Thanks for reporting!

from xgo.

dan-turner avatar dan-turner commented on August 26, 2024

I don't suppose we could maybe get a quick and dirty fix in? Something like adding the following immediately before the git pull:

git config --local user.email "[email protected]"
git config --local user.name "xgo"

This is currently blocking us and for us to work around it we'd have to fork your docker images and then the xgo client to point at our forked images

from xgo.

karalabe avatar karalabe commented on August 26, 2024

You could build a docker image with

FROM karalabe/xgo-latest

RUN git config --local user.email "[email protected]"
RUN git config --local user.name "xgo"

Build it with docker and then do xgo --image <your image tag>.

from xgo.

dan-turner avatar dan-turner commented on August 26, 2024

The other approach seems to be to do a fetch and reset rather than pull:

http://stackoverflow.com/a/17713604/464604

But the git config approach above seemed to look like the lightest touch

from xgo.

dan-turner avatar dan-turner commented on August 26, 2024

Aaaah, of course.. Sorry... Need another coffee evidently :P

from xgo.

karalabe avatar karalabe commented on August 26, 2024

I do need to fix this of course, just wanted to point you to a quick fix until this gets sorted out :D Btw, I'll probably go with the stack overflow approach of fetch/reset. It seems a bit more reliable than a hard coded magical address (though I didn't know about the fetch/reset approach, so kudos for linking it in for me!) :)

from xgo.

dan-turner avatar dan-turner commented on August 26, 2024

not working :(

https://github.com/dan-turner/xgo/blob/master/docker/go-dan/Dockerfile
https://hub.docker.com/r/danturner/xgo-latest/builds/b7kbhixouu7q2rltdqend7y/

"Build failed: Error: image karalabe/go-latest not found"

FROM karalabe/go-latest:latest

MAINTAINER Péter Szilágyi <[email protected]>

RUN git config --global user.email "[email protected]" && git config --global user.name "xgo"

from xgo.

karalabe avatar karalabe commented on August 26, 2024

xgo-latest

from xgo.

dan-turner avatar dan-turner commented on August 26, 2024

Oh God... I think I just need to go home :P

Sorry mate...

from xgo.

dan-turner avatar dan-turner commented on August 26, 2024

Ok, so at first I tried the approach mentioned above and setting a username and email in git config, and whilst I got ever so slightly further I hit this:

CONFLICT (rename/add): Rename rpc/api/shh_js.go->params/util.go in HEAD. params/util.go added in 9a04d9272eef39807b1dd73f6fa049d92c806ca0
Adding as params/util.go~9a04d9272eef39807b1dd73f6fa049d92c806ca0 instead
CONFLICT (modify/delete): xeth/xeth.go deleted in HEAD and modified in 9a04d9272eef39807b1dd73f6fa049d92c806ca0. Version 9a04d9272eef39807b1dd73f6fa049d92c806ca0 of xeth/xeth.go left in tree.
Auto-merging tests/transaction_test_util.go
CONFLICT (content): Merge conflict in tests/transaction_test_util.go
Auto-merging tests/state_test_util.go
CONFLICT (content): Merge conflict in tests/state_test_util.go
Auto-merging tests/state_test.go
CONFLICT (content): Merge conflict in tests/state_test.go
Auto-merging tests/block_test_util.go
CONFLICT (content): Merge conflict in tests/block_test_util.go
<snipped>

There was really only one step that could have caused this, git checkout $REPO_BRANCH. It seems as though the initial clone doesn't result in the working directory being a proper git repo, so when a fetch is done and it ultimately tries to switch branches, it just sees a bunch of untracked files, and any which you've changed in your branch are then in conflict. I managed to fix it by replacing the above command with, git reset --hard origin/$REPO_BRANCH. Now it works perfectly :). This way also no longer requires the git config stuff. PR on it's way.

from xgo.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.