Re: [git-users] Re: Git for Windows crash (patch.exe) when compiling gstreamer SDK
Hey Thomas, Thanks for taking the time to reply to me. I guess that is a more suitable forum. Already in a discussion on the GStreamer mailing list without any luck :( Have an awesome day! On Mon, Oct 28, 2013 at 4:01 PM, Thomas Ferris Nicolaisen tfn...@gmail.comwrote: On Monday, October 28, 2013 4:48:32 AM UTC+1, Lasse Laursen wrote: Dear Humans, I'm running into a spot of trouble that concerns the Git binaries for Windows, and I'm hoping that someone might be able to help me out. These past 2 weeks I've been attempting to compile the Gstreamer SDK on the windows platform following the following guide: http://docs.gstreamer.com/**display/GstSDK/Building+from+** source+using+Cerberohttp://docs.gstreamer.com/display/GstSDK/Building+from+source+using+Cerbero Having followed all of the instructions I've gotten to the part of where I build the SDK with the 'bootstrap' command. Unfortunately, this eventually leads to 'patch.exe', that comes with Git, to crash. Basically giving me this output: I think I would either bring this up with either the gstreamer or the msysgit developers. The latter can be reached on http://groups.google.com/group/msysgit -- You received this message because you are subscribed to a topic in the Google Groups Git for human beings group. To unsubscribe from this topic, visit https://groups.google.com/d/topic/git-users/kAq6gqHab-Y/unsubscribe. To unsubscribe from this group and all its topics, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Recommendations on a windows-based GIT environment with a local server
Hi Magnus, Thanks for your reply. So you say we should use a windows network drive or network share on a (server)computer with a normal standard git configuration for now? Why would you not use gitblit? Is there any (easy) way to make sure that only one person may merge to the master/head branch? Thanks, sevenflip. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Recommendations on a windows-based GIT environment with a local server
On Wed, 30 Oct 2013 02:43:14 -0700 (PDT) my.sevenf...@gmail.com wrote: Thanks for your reply. So you say we should use a windows network drive or network share on a (server)computer with a normal standard git configuration for now? Yes. Just make sure you have transparently working authentication on that share for everyone involved -- this means, that when each of your devs fires up Windows Explorer on their box and navigates that \\server\share UNC path, the remote system must authenticate them automatically using that dev's user name and password, so that Windows Explorer does not show any errors and does not pop an authentication dialog. This is needed because Git has no way to present the user with the same dialog and attempts to access the repository will just fail. Why would you not use gitblit? Because you yourself told us it crashed on you. Also, with the setup this simple (one repository, four users) using a high-profile server side solution might be a bit too much for a start. Is there any (easy) way to make sure that only one person may merge to the master/head branch? I would suggest you to not get obsessed with things like this for now. This kind of problem largely exists only in centralized systems where making wrong history requries involved fixing on the server side using specialized tools. Contrary to this, with Git, if someone botches a branch in your central rendez-vouz repo, you would just cook a correct one in your own local reposisotry and then force-push it to the central one, essentially replacing the botched one. In any case you might create a so-called post-receive hook in the centralized repository which would check if a forbidden ref is attempted to be updated and fail if the user who attempted this is not the one allowed to do that. Start with `git help hooks`. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] Re: Do I need to track a directory to be able to subtree and push it to a different remote branch?
I appreciate your reply, and apologize for taking too long to respond. Thank you for your concise explanation as well as connecting me to the Yeoman channel - it would certainly come in handy in the future. Regarding your view about alternative solutions, I completely agree with all of your points. I eventually opted to use git-directory-deployhttps://github.com/X1011/git-directory-deploywith Yeoman - it simplifies the whole deployment/publishing process, and it is CI ready, so as our project expands we'll be already covered from that angle too. It was also very easy to set up. Stereokai On Tuesday, October 22, 2013 11:24:32 AM UTC+3, Thomas Ferris Nicolaisen wrote: On Saturday, October 12, 2013 11:21:47 AM UTC+2, Tom Alon wrote: I use one repo with develop and release branches for a Yeoman project. Simplified, my directory tree looks like this: root git directory ├── app └── dist (the build folder) With Grunt.js I build my app straight into dist. I would like to use git subtree push --prefix dist origin release to conveniently update release with a new build - as detailed in the Yeoman documentation http://yeoman.io/deployment.html. Do I need to track, commit and push the dist directory in the developbranch at all times to use this method? Well, you have to commit it in order to do the subtree push, so it's already being tracked. I would like to know as well - since on my own, I could not make the above work conveniently - would a submodule tracking the release branch be a better solution? It's hard to say what would be better, as it's a subjective thing. Perhaps you would be better off discussing this with Yeoman users? They have an IRC channel #yeoman on FreeNode. Personally I find it somewhat of an anti-pattern to check in built artifacts, but for small projects it doesn't matter in the short run. Putting the dist stuff in a submodule would probably be better long term, but it adds complexity, and that's probably why the Yeoman guide doesn't do that. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Another easy merge question
Given that I have already made a commit of my new changes in master (but not a push), is this still the way to go? Eric On Tue, Oct 29, 2013 at 4:43 PM, William Seiti Mizuta william.miz...@gmail.com wrote: Hi Eric, to not lose your changes, you can create a branch which represents your current state of your repository. For this, just create a branch with git branch fallback command. It will be a copy of your current branch, so run this command when you are at master branch. Then, you can return to your remote master state with git reset --hard origin/master. When you want to recover the modifications, just merge the content of fallback branch: git merge fallback. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Tue, Oct 29, 2013 at 9:07 PM, Eric Fowler eric.fow...@gmail.comwrote: I did a commit and push into master a while back. I stayed in master and made some changes, which I have committed but not pushed. I want to store the changes but revert my working code to the code I last pushed (for some regression testing), without permanently discarding the new changes. How can I do this? -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out. -- You received this message because you are subscribed to a topic in the Google Groups Git for human beings group. To unsubscribe from this topic, visit https://groups.google.com/d/topic/git-users/xwpB4rnT2Kg/unsubscribe. To unsubscribe from this group and all its topics, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out. -- cc:NSA -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Another easy merge question
If you want to use the changes in the commits after, yes. If you don't need these commits anymore, you can just use git reset --hard origin/master and all your commits that you haven't pushed yet will be almost lost. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Wed, Oct 30, 2013 at 3:39 PM, Eric Fowler eric.fow...@gmail.com wrote: Given that I have already made a commit of my new changes in master (but not a push), is this still the way to go? Eric On Tue, Oct 29, 2013 at 4:43 PM, William Seiti Mizuta william.miz...@gmail.com wrote: Hi Eric, to not lose your changes, you can create a branch which represents your current state of your repository. For this, just create a branch with git branch fallback command. It will be a copy of your current branch, so run this command when you are at master branch. Then, you can return to your remote master state with git reset --hard origin/master. When you want to recover the modifications, just merge the content of fallback branch: git merge fallback. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Tue, Oct 29, 2013 at 9:07 PM, Eric Fowler eric.fow...@gmail.comwrote: I did a commit and push into master a while back. I stayed in master and made some changes, which I have committed but not pushed. I want to store the changes but revert my working code to the code I last pushed (for some regression testing), without permanently discarding the new changes. How can I do this? -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out. -- You received this message because you are subscribed to a topic in the Google Groups Git for human beings group. To unsubscribe from this topic, visit https://groups.google.com/d/topic/git-users/xwpB4rnT2Kg/unsubscribe. To unsubscribe from this group and all its topics, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out. -- cc:NSA -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Re: A few GIT questions.
I don't think you can add desciptions to files, though you can add notes to commits: http://alblue.bandlem.com/2011/11/git-tip-of-week-git-notes.html You have a pretty specific work-flow, I don't think any tool is going to do this out of the box, much less have IDE integration, but using git notes might help, and you could use them as basis for some custom tooling. I have to ask, why not add structured comments in your files? Then add some scripts to list the 1234.sql filename, along with the '% NAME: readable-name.sql' comment. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] Another easy merge question
On Oct 30, 2013 10:40 AM, Eric Fowler eric.fow...@gmail.com wrote: Given that I have already made a commit of my new changes in master (but not a push), is this still the way to go? That'll work fine. You could also do 'git checkout origin/master' to leave your local master branch the way it is. That puts you into a detached HEAD, where you're not on any local branch, so you'll want to use git checkout again to move back to a branch (or create a branch) before you commit anything. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
