[git-users] Re: Checking in another user's local changes to a remote repository without his password?

2012-01-22 Thread dspfun
Thank you for your help!

Brs,
Markus

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.



[git-users] Re: Checking in another user's local changes to a remote repository without his password?

2012-01-22 Thread Thomas Ferris Nicolaisen

>
> > So if you have physical access to your colleagues machine, but not his 
> > password, you can either: 
> > 1) Add a new url using your own username, and then use your own password 
> > when pushing to this url 
>
> Do you mean I should push my local repository to my colleague's local 
> repository? What would the command for this be? 
>

I mean this:

cd colleagues-repository
git remote add origin-as-markus markus.username@server:repository.git
git push origin-as-markus master



> 2) Share your colleagues repository, either running git daemon, or first 
> > pushing to a repository where you both have access. 
>
> Do you mean I should push my colleague's local repository or my own 
> local repository to a repository we both have access? 
>

No, this is just a mean to get access to your colleague's latest commit. 
Please read on.
 

> > If this is a problem 
> > network-wise, push to a repository on a USB stick. Once you have access 
> to 
> > his latest commits on your own computer, merge them to your own 
> repository 
> > and then push them to the central remote repo. 
> > 
>
> So basically I would do a pull (fetch + merge) from my colleagues 
> local repository into my own local repository and then push my merged 

local repository to the remote repository? 
>

Yes, exactly:

cd your-own-repository
git remote add colleague-repo /shared/colleague/repository
git fetch colleague-repo
git branch -a (find which branch you want to merge in)
git merge colleague-repo/master
git push origin master

All these commands assume that your development branch is called "master".

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/SlQ7aEW3stMJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.



[git-users] Re: Checking in another user's local changes to a remote repository without his password?

2012-01-22 Thread dspfun


On 22 Jan, 14:10, Thomas Ferris Nicolaisen  wrote:
> Hi Markus,
>
> Strictly speaking, authentication and authorization is outside the
> responsibilities of Git.
>
> You leave this to either the filesystem of the repository (which can also
> accessible via ssh), or use some custom method offered by tools like
> Gitorious or Gitosis.
>
> At our place, we use ssh like you do, to reach a central git repository. We
> have a single user-account called "git" that we all share to write to the
> repository, so the password is the same for all developers (although we use
> our individual keys that have been added in ~git/.ssh/authorized_keys so we
> don't have to type the password all the time).
>
> I assume that each of you use your own account to access the repository
> though (if the url to the git-repo is your.user.name@server:repo.git then
> this is probably the case).

Yes, this is the case! Also, my colleagues local repository and my
local repository is on the same machine and I have read access to my
colleages local repository. Only the remote repository resides on a
different machine.

> So if you have physical access to your colleagues machine, but not his
> password, you can either:
> 1) Add a new url using your own username, and then use your own password
> when pushing to this url

Do you mean I should push my local repository to my colleague's local
repository? What would the command for this be?

> 2) Share your colleagues repository, either running git daemon, or first
> pushing to a repository where you both have access.

Do you mean I should push my colleague's local repository or my own
local repository to a repository we both have access?

> If this is a problem
> network-wise, push to a repository on a USB stick. Once you have access to
> his latest commits on your own computer, merge them to your own repository
> and then push them to the central remote repo.
>

So basically I would do a pull (fetch + merge) from my colleagues
local repository into my own local repository and then push my merged
local repository to the remote repository?

> If you need more help with the syntax or commands here, let us know.

Yes, it would be great if you could provide with the example
commands!

Brs,
Markus

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.



[git-users] Re: Checking in another user's local changes to a remote repository without his password?

2012-01-22 Thread Thomas Ferris Nicolaisen
Hi Markus,

Strictly speaking, authentication and authorization is outside the 
responsibilities of Git.

You leave this to either the filesystem of the repository (which can also 
accessible via ssh), or use some custom method offered by tools like 
Gitorious or Gitosis.

At our place, we use ssh like you do, to reach a central git repository. We 
have a single user-account called "git" that we all share to write to the 
repository, so the password is the same for all developers (although we use 
our individual keys that have been added in ~git/.ssh/authorized_keys so we 
don't have to type the password all the time).

I assume that each of you use your own account to access the repository 
though (if the url to the git-repo is your.user.name@server:repo.git then 
this is probably the case).

So if you have physical access to your colleagues machine, but not his 
password, you can either:
1) Add a new url using your own username, and then use your own password 
when pushing to this url
2) Share your colleagues repository, either running git daemon, or first 
pushing to a repository where you both have access. If this is a problem 
network-wise, push to a repository on a USB stick. Once you have access to 
his latest commits on your own computer, merge them to your own repository 
and then push them to the central remote repo.

If you need more help with the syntax or commands here, let us know.


-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/EM03uKQXwloJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.