[git-users] Re: Updating multiple subtrees in a repository

2014-12-29 Thread Mattias Vannergård
Hi Carl! I am looking into a set up for this, too. As far as I have found out, you need to script a "recursive subtree pull" yourself, using the info stored in .gittrees Have you yet found another solution? BR /Mattias Den tisdagen den 7:e oktober 2014 kl. 12:31:24 UTC+2 skrev Carl Cook: > >

[git-users] Is version match using Linux server and Windows client necessary?

2014-12-29 Thread Mattias Vannergård
Hi! I have set up an environment for Git using a central repository on a server running SuSE 12, and clients running Win 7. I did sync the versions so both server and clients are running 1.9.4. Is this necessary or should I upgrade the server to 2.2.0 as soon as possible? On upgrade - in which

Re: [git-users] Re: Updating multiple subtrees in a repository

2014-12-30 Thread Mattias Vannergård
nstead of subtrees, as I've found submodules to do what I need > (thankfully)... which is to be a replacement for svn externals. > > Good luck! > Carl > > On 29 December 2014 at 16:34, Mattias Vannergård < > mattias.vannerg...@gmail.com> wrote: > >> Hi Carl! &g

Re: [git-users] Re: Updating multiple subtrees in a repository

2014-12-30 Thread Mattias Vannergård
for me right now... I'm still converting the projects over > from svn to git, but it really looks like git submodules are going to work. > I'll keep you posted! > > On 30 December 2014 at 10:08, Mattias Vannergård < > mattias.vannerg...@gmail.com> wrote: > >

[git-users] post-receive hook does not get run

2015-05-21 Thread Mattias Vannergård
I have a server with a lot of bare repos, but none of these projects will run the post-receive hook. For example: Path is /gitRepos/repositories/MyNewProject.git The content of the post-receive hook is !#/bin/sh echo "Hello" Running /gitRepos/repositories/MyNewProject.git/hooks/post-receive loc

[git-users] Re: post-receive hook does not get run

2015-05-21 Thread Mattias Vannergård
Sorry! Using git 1.9.5 and gerrit 2.11 BR /Mattias -- 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 optio

[git-users] Re: post-receive hook does not get run

2015-05-23 Thread Mattias Vannergård
Ok. It seems like gerrit does in some way disables the git server-side hooks, and you have to use only gerrit-hooks. I was not aware of that. And we push via ssh to the gerrit server port. Thanks for your input. /Mattias -- You received this message because you are subscribed to the Google Gro

[git-users] Re: Query on git submodules

2015-05-28 Thread Mattias Vannergård
Hi! I am planning on using submodules in a way, where I can specify a configuration of repos with tags, and rebuild the submodule tree, when selecting a configuration on the top level. But, yet I have found no easy way to select the tag in a subrepo. I would like the .gitmodules to accept tag

Re: [git-users] Re: Subversion --> GIT (Externals)

2015-06-04 Thread Mattias Vannergård
Hi! I don't now if you are planning to use gerrit, but in our case, git-annex didn't work well at all. See [1] below. We had to go with git submodules, which has a way better support in gerrit, and better support for handling branches. We're also adding support for tag in .gitmodules, so we ca

[git-users] Zombie merge commit parent after svn2git - how to remove?

2015-08-20 Thread Mattias Vannergård
Hi! I have run svn2git and cleaned out most of the parts, so it looks smooth. One thing I won't get rid of is a folder "FOO", which is added directly under the root of the repo. In some stages this has been merged in, but the original commit is now empty (because Git does not handle empty fold

[git-users] Re: Noob question: In a large company setting, is it normal to spend 3+ hours a day sorting out git issues?

2017-01-11 Thread Mattias Vannergård
Git has a somewhat steep learning curve, so I have seen teams having these problems (3+ hours a day), when no-one on the team was a "Git champion", and they were not willing to actually learn... What kind of "strange issues" do you have to sort out? Do you have a common process for branching an

Re: [git-users] Issues with wrong merge to master

2017-08-31 Thread Mattias Vannergård
It is the merge strategies "theirs" and "ours" - https://git-scm.com/docs/merge-strategies Den torsdag 31 augusti 2017 kl. 10:17:04 UTC+2 skrev Prasanth Damodharan: > > thank you! > > On Wednesday, August 30, 2017 at 2:53:47 PM UTC+5:30, Michael Gersten > wrote: >> >> >> On 2017-08-30, at 1:30 A