Re: [git-users] Re: Doubts about Wordpress upgrade using git
Neat solution. Glad you got it working :) -- 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] Breaking branches out into their own repo - Am I crazy?
So I have this involved project that started off as a master branch. The master branch has continue to grow over these last few months, and at several points along the way, I've created client specific branches off master, to introduce some client specific behavior. Now, my boss tells me he no longer wants all the client specific stuff in the same repo as the main branch. He wants a separate repo for each one, and each repo should end up with just one branch named master. I am not totally sure how to approach this problem. I did a little testing whereby a setup a bare repo on my machine and added an origin to my source repo to point to this bare repo. Then I checked out some branch on my source repo, say desiredbranch tried to do a push neworigin desiredbranch. The push worked fine but then when I cloned this newly populated bare repo (to see how a working repo would look like, based in the newly populated bare repo) I I got this message: warning: remote HEAD refers to nonexistent ref, unable to checkout. So apparently I'm on the wrong track here.. Any pointers in the right direction would be greatly appreciated! Michael -- 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.
Re: [git-users] Breaking branches out into their own repo - Am I crazy?
On Mon, 14 Feb 2011 08:34:05 -0800 (PST) Veloz michaelve...@gmail.com wrote: [...] I did a little testing whereby a setup a bare repo on my machine and added an origin to my source repo to point to this bare repo. Then I checked out some branch on my source repo, say desiredbranch tried to do a push neworigin desiredbranch. The push worked fine but then when I cloned this newly populated bare repo (to see how a working repo would look like, based in the newly populated bare repo) I I got this message: warning: remote HEAD refers to nonexistent ref, unable to checkout. [...] Explanation: the HEAD ref in a bare repo points to a physical ref (usually a branch) which, when someone clones that repo, should be made the default in the resulting clone. When you initialize a bare repo its HEAD ref is set to point to the master branch but the branch itself does not exist (obviously). When you do $ git push neworigin desiredbranch Git creates desiredbranch in the remote repo, but its HEAD ref remains pointing to a non-existing master branch. So, there are two ways to fix the situation: at first, do $ cd /path/to/that/bare/repo and then either $ git branch -m desiredbranch master or $ git update-ref HEAD refs/heads/desiredbranch and then re-clone the bare repo. The first method simply renames desiredbranch to master, the second updates the HEAD ref to point to desiredbranch. Another way would be to re-create the bare repo and push your desired branch like this: $ git push neworigin desiredbranch:master so that it ends up being named master in the repote repo. -- 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: Breaking branches out into their own repo - Am I crazy?
Excellent!! The descriptions was wonderful, and the solutions worked. Yippee!! Michael On Feb 14, 12:27 pm, Konstantin Khomoutov flatw...@users.sourceforge.net wrote: On Mon, 14 Feb 2011 08:34:05 -0800 (PST) Veloz michaelve...@gmail.com wrote: [...] I did a little testing whereby a setup a bare repo on my machine and added an origin to my source repo to point to this bare repo. Then I checked out some branch on my source repo, say desiredbranch tried to do a push neworigin desiredbranch. The push worked fine but then when I cloned this newly populated bare repo (to see how a working repo would look like, based in the newly populated bare repo) I I got this message: warning: remote HEAD refers to nonexistent ref, unable to checkout. [...] Explanation: the HEAD ref in a bare repo points to a physical ref (usually a branch) which, when someone clones that repo, should be made the default in the resulting clone. When you initialize a bare repo its HEAD ref is set to point to the master branch but the branch itself does not exist (obviously). When you do $ git push neworigin desiredbranch Git creates desiredbranch in the remote repo, but its HEAD ref remains pointing to a non-existing master branch. So, there are two ways to fix the situation: at first, do $ cd /path/to/that/bare/repo and then either $ git branch -m desiredbranch master or $ git update-ref HEAD refs/heads/desiredbranch and then re-clone the bare repo. The first method simply renames desiredbranch to master, the second updates the HEAD ref to point to desiredbranch. Another way would be to re-create the bare repo and push your desired branch like this: $ git push neworigin desiredbranch:master so that it ends up being named master in the repote repo. -- 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.
Re: [git-users] Re: Setting up a remote repo when the local is already in course
Ok, thanks. So, even if my remote repo is a brand-new one and my local repo is ages old with a lots of history, after the push the remote repo will have all my history? = Daniel Trezub http://www.gameblogs.com.br On 13 February 2011 23:46, Jeenu gro...@jeenuv.otherinbox.com wrote: On Feb 14, 5:15 am, Daniel Trezub daniel...@gmail.com wrote: It's always good to have your release/master branch to have a linear history. Why? Does it make things easier when pushing to the remote repo? It's got nothing to do with pushing. It's just that your graph will look tidy and it'll more readable as well. Git will push your commit graph to the server however it looks. -- Jeenu -- 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. -- 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: Setting up a remote repo when the local is already in course
On Feb 15, 4:16 am, Daniel Trezub daniel...@gmail.com wrote: Ok, thanks. So, even if my remote repo is a brand-new one and my local repo is ages old with a lots of history, after the push the remote repo will have all my history? If all your history is reachable from the branch head that you're pushing to the remote, then yes, I think all of your commit graph will be replicated. However, AFAIK, it doesn't imply that pushing master will also push all the branches before it. You'd have all the commits, but the remote wouldn't have other branches. Branches, as we know it, are mere references or soft links to commits. The remote wouldn't host a branch unless you push that branch itself. For example, if you've a local branch named topic, just 2 commits behind master, and you push master to the remote, any fresh clone from the remote repo wouldn't have topic in it. To have a remote branch topic, you must push topic explicitly. Pushing topic again wouldn't cause any data transfer as the commit is already present in remote repo (as it's reachable from master when it was pushed). -- Jeenu -- 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.