How to push properly a la subversion

[Matthieu Stigler <matthieu.stigler@gmail.com>]

Hi

Thanks Dmitiri and Avery for your help and advices! I could understand
a little bit better, but I'm still confused. Actually what I did not
mention is that we are working on windows (actually 2000 and soon
vista :-(). The institute have a big programming project and I try to
introduce version control hopefully with git. The project is now
stored in a shared disk and there are no security/permissions issues
(every body is allowed to erase it basically:-(). Furthermore, there
are reluctant to install any new softwares and to use command line
software, I used for now portable GIT on windows, which seems to have
also ssh.

So I understood that I need to set-up a shared repo, thanks for your
advices! Now do I really need all those permissions issues? What is
the simplest way to deal with that?

I looked at http://toolmantim.com/articles/setting_up_a_new_remote_git_repository
but I'm stuck with first command:
ssh myserver.com

Does that need I should have previously set-up a ssh server? Is this a
necessary step?


In my case, the shared disk is say: T:\project\gitrepo
How should I do?

The second line in the tuto mentions:

mkdir /var/git/myapp.git && cd /var/git/myapp.git
Here /var is linux specific...
Is it any directory that is concerned or is it required to be in /var?
How do I set-it up in windows?


Finally, should I rather use something like Putty on windows?

Thank you so much for your precious help, I'm just discovering git...

Matthieu
2009/7/29 Dmitry Potapov <dpotapov@gmail.com>
On Wed, Jul 29, 2009 at 08:32:46PM +0200, Matthieu Stigler wrote:
>
> I tried just by cloning A to B, changing/commiting B and the pushing to
> A but: then on A the last log is integrated but I have this message with
> gitk "local changes checked in to index but not commited", and those
> local  changes are actually the version of A before the commit from B
> :-( What I expected with svn mentality is that A is changed and
> updated...

This is because git-push does not change your working tree. So, your
normally should never push to the branch that is currerently checked
out. (New versions of Git will warn you about that). As to having a
common/shared repo, it should be a "bare" repository.

>
> Should I enter a specifical push option? Or rather work on section
> "Setting up a shared repository"? in
> http://www.kernel.org/pub/software/scm/git/docs/gitcvs-migration.html ?
> I tried to do it entering:
>
> $ mkdir /pub/my-repo.git
> $ cd /pub/my-repo.git
> $ git --bare init --shared
> $ git --bare fetch /home/alice/myproject master:master
>
> but then I get also this message "local changes checked in to index but
> not commited" and especially there are many git files appearing that we
> would not want to see....

Strange... The above commands work perfectly for me.... And if you have
a bare repo then it should not have 'index'. So, the error does not make
much sense to me... Is it produced by gitk? Hmm, maybe some old version
of gitk did not work correctly with a bare repo... I dunno...

> And furthermore it seems there are complicated
> permissions/ssh issues that I don't need (I'm doing for now only
> locally).

I don't understand your troubles with permissions. Basically, there are
two options to setup a shared repo:
1. where every developer has each own account
2. a single account (but still each has each own ssh key)

The 'shared' option during init is necessary only for the first case to
make repository group writable. All users who can push to it should be
members of the group.

If you want to have a single system account for all users, you have two
options:
- gitosis
- ssh based authentification with forced command and then update hook
 if extra check is needed (see Documentation/howto/update-
>
> hook-example.txt)
>
>
> Dmitry