git-annex: Puzzling over bare repositories

[Joey Hess]

David Edmondson wrote:
> Set the default upstream:
> 
> 	laptop$ git branch master --set-upstream origin/master
> 	fatal: Not a valid object name: 'origin/master'.
>         laptop$ 
> 
> This fatal error seems to be the source of the later problems.

I've never needed to use --set-upstream, and you shouldn't need it here.

> 	laptop$ git push -v
> 	Pushing to ssh://server//one/git/m
> 	Warning: No xauth data; using fake authentication data for X11 forwarding.
> 	To ssh://server//one/git/m
> 	 ! [rejected]        git-annex -> git-annex (non-fast-forward)

You need to run git annex merge before pushing and all will be well.

-- 
see shy jo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 828 bytes
Desc: Digital signature
URL: <http://lists.madduck.net/pipermail/vcs-home/attachments/20111215/76136ea5/attachment.pgp>