Thread (3 messages) flat view 3 messages, 3 authors, 2016-06-15

Re: git push in a git-init without --bare option?

From: Matthieu Moy <hidden>
Date: 2016-06-15 22:51:31

Pedro Sa Costa [off-list ref] writes:
- I see that in git, I can't do git-push to a repository that wasn't created 
with git-init --bare. Why?

- But doing git-pull and git-checkout to the same repository is possible. I'm 
really confused. Any help?
git pull involves a merge, and merge may involve conflicts, and
conflicts involve a user fixing them ... So, doing a "git pull" to merge
in remote changes is OK, but a "git push" cannot merge changes remotely,
hence the asymetry.

Git could just send the commits, without updating the working tree, but
that would be terrible for the user. Let's say the user has no local
change before the push. His checkout points to the tip of a branch
(information stored in HEAD), so the tree matches the old HEAD. Updating
the branch means changing the commit pointed to by HEAD, hence after a
push, the tree does not match the HEAD anymore (which means the next
commit will seem to revert the pushed history). This is to prevent this
situation that Git refuses to push to non-bare repos.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help