Forums » Help »

Git

Added by Aeness almost 9 years ago

Hello,

I do not have any problem with the API but with Git. Anyway, I ask my questions here. I am not quite sure I have understood how Git works, maybe my questions will look strange.

First, just for confirmation, I tried some examples with a local repository and "push" seems to "break" the target which become a non-working repository.
In order to work (with the same branch), I have to :

$ git clone git://example.com/pub/project.git
(edit some files)
$ git commit -a -m "My modification" 
(edit some files)
$ git commit -a -m "My modification again" 
$ git git push ssh://myserver.com/~me/proj.git master

And if I want to use a submodule of ryzom_api, can I use the ryzom_api repository only (or some files) instead of the bare repository?
If I need to change the API, what do you prefer? Shall I use my own functions that use the API (what I have done so far)? Shall I create a branch of the ryzom_api and rewrite what I need? Shall I avoid using submodules and put only copies of the files I need, and use them the way I want?

Thanks,
Aeness


Replies (6)

RE: Git - Added by vl almost 9 years ago

You should use GitHub that make thing easier.
I never use Git with my own server and I know it's not an easy thing.

You should just clone the Ryzom Api following the instruction on GitHub. Then you can do all modification you want on it. and we'll see them on GitHub.

http://github.com/acemtp/ryzom_api/network you can see for example that diraven clone and modify the api.

If I want, I can easily integrate his modification on my branch if needed.

RE: Git - Added by nimetu almost 9 years ago

Aeness wrote:

First, just for confirmation, I tried some examples with a local repository and "push" seems to "break" the target which become a non-working repository.

break how ?

And if I want to use a submodule of ryzom_api, can I use the ryzom_api repository only (or some files) instead of the bare repository?

bare repository does not have any checked out files (only .git directory content), so it's only useful for central/remote repository.

i tried submodules once... never understood it's use. i think best is to describe external libraries (with dl link) on README file ;-)

RE: Git - Added by Aeness almost 9 years ago

nimetu wrote:

break how ?

I am not sure, but after a push, I was not able to update the target and see the added modifications,however a new clone of this repository contained the modifications ... strange isn't it ?

--

nimetu wrote:

bare repository does not have any checked out files (only .git directory content), so it's only useful for central/remote repository.

I did :

$ git submodule init 
$ git submodule update

and this was working.

--

vl wrote:

You should just clone the Ryzom Api following the instruction on GitHub. Then you can do all modification you want on it. and we'll see them on GitHub.

I did both, I forked the ryzom_api (and maybe I will put some modification) and used a submodule of my fork because I do not want Flunker to become a branch of ryzom_api (it is not logic for me, maybe it's a mistake).

--

vl wrote:

If I want, I can easily integrate his modification on my branch if needed.

And I have something to do, if I want to propose at you my modifications or not ?

RE: Git - Added by Aeness almost 9 years ago

Aeness wrote:

nimetu wrote:

break how ?

I am not sure, but after a push, I was not able to update the target and see the added modifications,however a new clone of this repository contained the modifications ... strange isn't it ?

--

nimetu wrote:

bare repository does not have any checked out files (only .git directory content), so it's only useful for central/remote repository.

I did :
[...]

and this was working.

--

vl wrote:

You should just clone the Ryzom Api following the instruction on GitHub. Then you can do all modification you want on it. and we'll see them on GitHub.

I did both, I forked the ryzom_api (and maybe I will put some modification) and used a submodule of my fork because I do not want Flunker to become a branch of ryzom_api (it is not logic for me, maybe it's a mistake).

--

vl wrote:

If I want, I can easily integrate his modification on my branch if needed.

And do I have something to do, if I want to propose at you my modifications or not ?

RE: Git - Added by nimetu almost 9 years ago

Aeness wrote:

I am not sure, but after a push, I was not able to update the target and see the added modifications,however a new clone of this repository contained the modifications ... strange isn't it ?

hmm, this one maybe ?
http://git.or.cz/gitwiki/GitFaq#Whywon.27tIseechangesintheremoterepoafter.22gitpush.22.3F

And I have something to do, if I want to propose at you my modifications or not ?

github explains the process in http://help.github.com/forking/

RE: Git - Added by Aeness almost 9 years ago

OK, thanks a lot for these answers ! :-)

Aeness

(1-6/6)