[git-users] Re: Commits only from specific branch
Do you understand what i mean? Is there any solution, or not? Thanks for reply;) On Friday, 29 June 2012 16:13:09 UTC+2, Nedvajz wrote: Hi, is there a way, how to pull/clone (somehow) only commits of one, and only one branch? For example: 1) Lets say i have 3 branches in one submodule. Master(commits 1,2,3,4) , Project1(commits 1,2,3,4,5) , Project2(commits 1,2,3,4,6,7,8). 2) I am starting with Project3 and wanna to get submodule Master branch only - git submodule add --only_specific_branch_commits http://example.com/submodule.git; 3) Now i will look into submodule, and git branch -v will show me only master, and as well git branch -vr show me only origin/master ... And if i will try to git cherry-pick 5 on Master branch- where 5 is commit of Project1 only, there wont be any entry in history or so - so it fails Why I am looking for something like this? We have cms for making Sites composed from submodules and via sumbodules we can easily modificate what cms can/cant. But always is there needed to specify one of plugins directly for that project and there are changes useless for another projects. So we made it till now via specific branch to get exactly what we need. But after many and many projects, the repo of the most specified plugins(modules) is going to be huge and it is not needed at all to get all commits of all projects into new one, but just the clean master branch with their commits. Thanks for any help, Nedvajz. -- 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/-/kabnLInSA7YJ. 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: Commits only from specific branch
Hi, sorry for not replying any more. I managed to lose track of this thread. I'm afraid I still don't quite understand, although I didn't have quite the time to read properly through your explanation. There are still a lot of confusing terms in there that don't fit with my typical Git language, so let me try at another interpretation. As it is often easier to solve a problem by first splitting it into several smaller isolated problems, I'll exclude the fact that you want this in a submodule. A submodule is just a link to a commit in another Git repository in the end, so I'm not sure if that's a relevant factor for this question. We can come back to it later anyhow. *You want a repository clone that only has knowledge of a few branches.* Does maybe this recipe [1] establish that kind of repository you want? If this does not help you, could you perhaps try saying on a higher level what you are actually trying to achieve without going into concrete Git details? Perhaps someone has a better idea of an approach to suit your needs. [1] http://stackoverflow.com/questions/1615488/clone-just-the-stable-and-one-other-branch-in-git On Monday, July 16, 2012 11:27:47 AM UTC+2, Nedvajz wrote: Do you understand what i mean? Is there any solution, or not? Thanks for reply;) On Friday, 29 June 2012 16:13:09 UTC+2, Nedvajz wrote: Hi, is there a way, how to pull/clone (somehow) only commits of one, and only one branch? For example: 1) Lets say i have 3 branches in one submodule. Master(commits 1,2,3,4) , Project1(commits 1,2,3,4,5) , Project2(commits 1,2,3,4,6,7,8). 2) I am starting with Project3 and wanna to get submodule Master branch only - git submodule add --only_specific_branch_commits http://example.com/submodule.git; 3) Now i will look into submodule, and git branch -v will show me only master, and as well git branch -vr show me only origin/master ... And if i will try to git cherry-pick 5 on Master branch- where 5 is commit of Project1 only, there wont be any entry in history or so - so it fails Why I am looking for something like this? We have cms for making Sites composed from submodules and via sumbodules we can easily modificate what cms can/cant. But always is there needed to specify one of plugins directly for that project and there are changes useless for another projects. So we made it till now via specific branch to get exactly what we need. But after many and many projects, the repo of the most specified plugins(modules) is going to be huge and it is not needed at all to get all commits of all projects into new one, but just the clean master branch with their commits. Thanks for any help, Nedvajz. -- 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/-/zEY0hQOKyTUJ. 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] mergetool bug when merging ignored files from stash
Hi I'm quite a git beginner. I'm still evaluating git with git-svn v1.7.1 on rhel6. I think I found a bug in git mergetool, but as I'm a beginner I'm not sure. Looking around, It looks that the bug is similar to the one reported here: http://git.661346.n2.nabble.com/BUG-mergetool-fails-on-gitignore-d-files-td2998927.html But the bug reproduction script works for me (meaning the bug was corrected) I couldn't create a bug reproduction script, but here are the details I can give: I use a .gitignore set to * to ignore everything. I have to use git add -f to add files I wanted to make a partial commit to svn (I'm using git svn) I had to create a stash with git stash to make the git svn dcommit But I also had to rebase because of remote modifications. When I popped the stash back there were conflicts. I used git mergetool (with kdiff3) to resolve the conflicts. At the end of the conflict resolution, mergetool says that it can't add ignored files, and it must use the -f flag to git add (I don't have the exact message) The merge had no effects. The workaround was to empty the .gitignore file, then launch mergetool again. I tried to reproduce the problem, but popping a stash after a branch merge seems to work (the mergetool works as expected) So the problem looks related to git svn. Hope this helps. Sophana -- 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/-/RAs-4-jImZ0J. 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: Commits only from specific branch
The link you posted is almost what i want. So this i my last try of explain what i am looking for: 1) I want to *clone* only part of some repository and made new one. This new repo will have only master branch even if the origin has more branches. This new repo will have only commits of the master branch even if the origin has more commits of other branches. (the new repo will be smaller in size = number of commits). 2) I wont lose ability work with old repo. Push/Pull to/from origin master branch. Making new branches in new repo, and pull them onto origin repo. 3) But till I directly set (somehow) this new git repo. It wont fetch any new branches and/or get any commits which doesnt belong to master branch from origin repo. So I make summary. The link you posted allow me work like i want, but it works with basic repo. I need this to work *on* *submodules*. So when I will work with project, and make changes in submodules and then I will clone whole project somewhere and run git submodule update all submodules will fetch only needed branch with its commits only(like it is in link, but for *submodule here*) Thanks for you patience! On Monday, 16 July 2012 15:27:34 UTC+2, Thomas Ferris Nicolaisen wrote: Hi, sorry for not replying any more. I managed to lose track of this thread. I'm afraid I still don't quite understand, although I didn't have quite the time to read properly through your explanation. There are still a lot of confusing terms in there that don't fit with my typical Git language, so let me try at another interpretation. As it is often easier to solve a problem by first splitting it into several smaller isolated problems, I'll exclude the fact that you want this in a submodule. A submodule is just a link to a commit in another Git repository in the end, so I'm not sure if that's a relevant factor for this question. We can come back to it later anyhow. *You want a repository clone that only has knowledge of a few branches.* Does maybe this recipe [1] establish that kind of repository you want? If this does not help you, could you perhaps try saying on a higher level what you are actually trying to achieve without going into concrete Git details? Perhaps someone has a better idea of an approach to suit your needs. [1] http://stackoverflow.com/questions/1615488/clone-just-the-stable-and-one-other-branch-in-git On Monday, July 16, 2012 11:27:47 AM UTC+2, Nedvajz wrote: Do you understand what i mean? Is there any solution, or not? Thanks for reply;) On Friday, 29 June 2012 16:13:09 UTC+2, Nedvajz wrote: Hi, is there a way, how to pull/clone (somehow) only commits of one, and only one branch? For example: 1) Lets say i have 3 branches in one submodule. Master(commits 1,2,3,4) , Project1(commits 1,2,3,4,5) , Project2(commits 1,2,3,4,6,7,8). 2) I am starting with Project3 and wanna to get submodule Master branch only - git submodule add --only_specific_branch_commits http://example.com/submodule.git; 3) Now i will look into submodule, and git branch -v will show me only master, and as well git branch -vr show me only origin/master ... And if i will try to git cherry-pick 5 on Master branch- where 5 is commit of Project1 only, there wont be any entry in history or so - so it fails Why I am looking for something like this? We have cms for making Sites composed from submodules and via sumbodules we can easily modificate what cms can/cant. But always is there needed to specify one of plugins directly for that project and there are changes useless for another projects. So we made it till now via specific branch to get exactly what we need. But after many and many projects, the repo of the most specified plugins(modules) is going to be huge and it is not needed at all to get all commits of all projects into new one, but just the clean master branch with their commits. Thanks for any help, Nedvajz. -- 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/-/xEixThn5-mEJ. 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] Error: dyld: unknown required load command 0x80000022
I've installed git on a Mac running OS X 10.5.8, but whenever I run any git commands, I get the error listed in the subject of this post. I downloaded the file from here: http://git-scm.com/downloads. The download seemed to work fine. The file I have is git-1.7.11.1-intel-universal-snow-leopard.dmg. Much gratitude. -- 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/-/acyVwTumsMMJ. 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] mergetool bug when merging ignored files from stash
On Mon, 16 Jul 2012 07:09:36 -0700 (PDT) sophana soph...@worldspot.net wrote: I'm quite a git beginner. I'm still evaluating git with git-svn v1.7.1 on rhel6. I think I found a bug in git mergetool, but as I'm a beginner I'm not sure. [...] Hope this helps. Unfortunately, this list is for solving problems beginners have with Git, not problems with Git itself. Please post your message to the main Git list which is git at vger.kernel.org (you can subscribe to it at [1]) and it will be read by Git developers. 1. http://vger.kernel.org/vger-lists.html -- 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] git contents model
On Sat, Jul 14, 2012 at 12:12 AM, Angelo Borsotti angelo.borso...@gmail.com wrote: Hi P.J. exactly. That is the answer. Surfing the web I have seen that bare repositories are supported only in git 1.7. Since it is (and was) not possible to push to a non-bare repository, I wander how the community used git pre-1.7. No one ever used a remote repository to push files since now? I don't know the history in detail, but I know the restriction against pushing to non-bare repositories is relatively recent. Maybe the part that was new in 1.7 was the config option that lets the repository know that it's bare and can therefore accept pushes? I can't think of any other reason for the bare/non-bare distinction to be kept in the repository itself. -PJ Gehm's Corollary to Clark's Law: Any technology distinguishable from magic is insufficiently advanced. -- 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] git fetch question
I have a local repo and a remote repo, something, both contain the branch develop. Before I do a git fetch git rev-parse develop - SHA1 git rev-parse something/develop - SHA1 $git checkout master $git fetch something $git rev-parse develop SHA1 $git rev-parse something/develop SHA2 $git status Your branch is behind by x commits Perfect, just as I expected. But what if I don't want to do a git fetch something The reason for that is that I would be fetching a whole lot more than I need. The remote repo has several other branches that I have no need for. I would like to do something like git fetch something but only for one branch. If I do git fetch something develop, it ends up in FETCH_HEAD, if I do git fetch something develop:develop you get: $git checkout master $git fetch something develop:develop $git rev-parse develop SHA2 $git rev-parse something/develop SHA1 $git status Your branch is ahead by x commits So is there a way to update the SHA in something/develop? I want to use this in a script, comparing the local branch and remote branch. -- Peter van der Does GPG key: CB317D6E IRC: Ganseki on irc.freenode.net Twitter: @petervanderdoes -- 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.
