Fwd: Strange remote interaction

Fwd: Strange remote interaction

[Javier Domingo]

[-- Attachment #1: Type: text/plain, Size: 127 bytes --]

Hi,

I have just had the attached bash session, and I have no idea on what
is going on.

Any help appreciated,

Javier Domingo

[-- Attachment #2: bug --]
[-- Type: application/octet-stream, Size: 731 bytes --]

javier@frodo:~/proyectos/pfc$ git push -vvv javier master
Pushing to git@server:javier/pfc
To git@server:javier/pfc
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'git@server:javier/pfc'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and merge the remote changes
hint: (e.g. 'git pull') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
javier@frodo:~/proyectos/pfc$ git fetch -vvv javier 
From server:javier/pfc
 = [up to date]      master     -> javier/master
javier@frodo:~/proyectos/pfc$ git merge javier/master 
Already up-to-date.
javier@frodo:~/proyectos/pfc$ 

Re: Fwd: Strange remote interaction

[Junio C Hamano]

Javier Domingo <javierdo1@gmail.com> writes:

> I have just had the attached bash session, and I have no idea on what
> is going on.
>
> Any help appreciated,
>
> Javier Domingo
>
> javier@frodo:~/proyectos/pfc$ git push -vvv javier master
> Pushing to git@server:javier/pfc
> To git@server:javier/pfc
>  ! [rejected]        master -> master (non-fast-forward)
> error: failed to push some refs to 'git@server:javier/pfc'
> hint: Updates were rejected because a pushed branch tip is behind its remote
> hint: counterpart. Check out this branch and merge the remote changes
> hint: (e.g. 'git pull') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.

So push is going to git@server:javier/pfc repository, while ...

> javier@frodo:~/proyectos/pfc$ git fetch -vvv javier 
> From server:javier/pfc
>  = [up to date]      master     -> javier/master

... fetch/pull goes to server:javier/pfc repository.  Are they the
same?

In a usual set-up, an access to git@server:javier/pfc will first
locate the home directory for the user "git" (the token before "@"),
and then its subdirectory javier/pfc, e.g. /home/git/javier/pfc,
while an access to server:javier/pfc will first locate the home
directory of whatever username the ssh connection uses by default
(typically the local user but ~/.ssh/config may have "User"
directive for the server) and then its subdirectory javier/pfc,
e.g. /home/javier/javier/pfc.  These two may be different locations.

Do these two commands show the same output?

	$ git ls-remote git@server:javier/pfc refs/heads/master
        $ git ls-remote server:javier/pfc refs/heads/master

If the above conjecture is correct, I suspect they don't.

Re: Fwd: Strange remote interaction

[Javier Domingo]

> In a usual set-up, an access to git@server:javier/pfc will first
> locate the home directory for the user "git" (the token before "@"),
> and then its subdirectory javier/pfc, e.g. /home/git/javier/pfc,
> while an access to server:javier/pfc will first locate the home
> directory of whatever username the ssh connection uses by default
> (typically the local user but ~/.ssh/config may have "User"
> directive for the server) and then its subdirectory javier/pfc,
> e.g. /home/javier/javier/pfc.  These two may be different locations.
>
> Do these two commands show the same output?
>
>         $ git ls-remote git@server:javier/pfc refs/heads/master
>         $ git ls-remote server:javier/pfc refs/heads/master
>
> If the above conjecture is correct, I suspect they don't.

I have a gitolite setup there, so it is imposible the give the same
output. Anyways, as I don't have a user in the server machine, the
second fails.

$ git ls-remote git@server:javier/pfc
22692a2d69d3138b7ccebd64e72c66ea8bf69e9f HEAD
22692a2d69d3138b7ccebd64e72c66ea8bf69e9f refs/heads/master

It is the first time I encounter such a problem.