Ben's messing aroung with FreeEMS-Tuner code

[sry_not4sale]

Merged master back into benfenner branch

[Fred]

It's better, but still a bit borked :-)

Ben :

http://freeems.aaronb.info/tracker/view.php?id=76

Enjoy :-)

Fred.

[jharvey]

After spending 9,000+ hours with Aaron last night we finally got git working with SSH and I can now push my changes for Aaron to use in the master repository.

I plan on writing up a short "how to" on the process soon.

I'm curious if there has been progress on this "how to" I'm still McIgnorant when it comes to git. Your's was a windows GIT install yes? I'm looking just for the pull feature right now.

I've got git, git-gui, and a pile of others git's. Seems my problem right now is about this error message.

"fatal: Not a git repository"

So I'm still learning about that. Digesting the man file, for at least a couple more minutes.

[Fred]

git isn't easy like svn, but it has some certain features which mean svn will have to take a back seat. I'll be trying to keep two repositories from one master directory :-) hopefully it works out well for me.

Fred.

[BenFenner]

I'm curious if there has been progress on this "how to".

I've been slacking on that. I'll get to it as needed I guess. =(

Your's was a windows GIT install yes?

Yes.

I'm looking just for the pull feature right now.

Pull was very easy for me to get. Or was it clone? Yah, it was "clone". Pull I think requires the whole SSH thing, but "clone" will download the entire repo, which is what you want I think.

Seems my problem right now is about this error message.

"fatal: Not a git repository"

I think Aaron's the guy to talk to about all this. It went so smoothly for me I don't remember how to do it, and Aaron's the reason we're using Git, so he should have to field this sort of thing. =]
I can really only help with the SSH key part of the Windows Git experience, as I had quite a bit of trouble with that, so I know it better.

[Fred]

After you clone you can pull. You don't need ssh to do that. You only need ssh to push which I doubt Jared would want to do. I may get something setup so I can add my little hacks in though :-)

to clone you do something like :

Code: Select all

git clone <clone url> <directory to create>

and then after that you just do :

Code: Select all

git pull

assuming you change nothing. If you change something you do :

Code: Select all

git reset --hard HEAD

to blow away your mess ;-)

Fred.

EDIT to add dirname that I forgot, thanks Aaron ;-)

[sry_not4sale]

After spending 9,000+ hours with Aaron last night we finally got git working with SSH and I can now push my changes for Aaron to use in the master repository.

I plan on writing up a short "how to" on the process soon.

I'm curious if there has been progress on this "how to" I'm still McIgnorant when it comes to git. Your's was a windows GIT install yes? I'm looking just for the pull feature right now.

I've got git, git-gui, and a pile of others git's. Seems my problem right now is about this error message.

"fatal: Not a git repository"

So I'm still learning about that. Digesting the man file, for at least a couple more minutes.

That error is because you are not in a git controlled directory when you are running a command.

To create a git controlled directory, you need to either create a fresh repo or clone the FreeEMS one:

Code: Select all

git clone git://github.com/srynot4sale/freeems-tuner.git dirrname

That command will clone the git repo into a directory called dirrname

[Fred]

Not sure if I already linked you this or not, but here is a task :

http://freeems.aaronb.info/tracker/view.php?id=76

That should be easy, as should...

And here is a new one that we discussed earlier :

http://freeems.aaronb.info/tracker/view.php?id=79

If anything is unclear, please comment and assign back to me or just ask on IM etc. I've included the packet details in there for Aaron to parse, assign it over to him when the gui aspect of it is done :-)

Fred.

[BenFenner]

Didn't get Fred's PM in time so I've got the real-time data display finished first.

http://freeems.aaronb.info/tracker/view.php?id=79


It doesn't work as there is no bad-end. Aaron will either put that in, or let me know when it can be completed (waiting on packet parsing I think).
I'll push the changes when I get home.

[Fred]

Thanks for that, and also, thanks for this :



Good work :-)

Fred.