Re: [git-users] advice for migration
On Thu, Apr 03, 2014 at 10:28:12AM -0700, Phil Cruz wrote: > I need some guidance on how to import our existing SVN repo to Git. The > structure of the repo is not exactly standard. Say we have 2 versions of > our app in the repo, Version1, the currently shipping version and Version2, > the next version in development. The SVN structure is like > > /branches > /Version1_some_branch > /Version2_feature_branch1 > > /tags > /Version1 > /build_1 > /build_2 > /Version2 > /build_1 > /releases > /Version1 > /Release_1.0 > /Releale_1.1 > /trunk > /Version1 > /Version2 > > > There's actually more but this conveys the basic structure. I'm fine > with not trying to migrate the entire repo with all the history and > tags and releases. There's a lot of extraneous stuff like binary > files and I think we'll be better off to start relatively clean. If > possible I would like to import the working trunks/branches with > history. So something like > > /trunk/Version1 becomes the "master" branch > /trunk/Version2 becomes "Version2" branch > /branches/Version2_feature_branch1 becomes "Version2_feature_branch1" > /branches/Version1_some_branch becomes "Version1_some_branch" > > Is there a way to do something like that? I'd consider that layout very ordered and clean actually. :) If you are looking at using git-svn for the conversion, then pay notice to this part of the man-page: You can specify more than one --tags and/or --branches options, in case your Subversion repository places tags or branches under multiple paths. This seems to be exactly the thing you need. If you are looking at using subgit then it too allows for picking up tags and branches in multiple places. /M -- Magnus Therning OpenPGP: 0xAB4DFBA4 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus Goto labels should be left-aligned in all caps and should include the programmer's name, home phone number, and credit card number. -- Abdul Nizar pgpUE3Wua1_zm.pgp Description: PGP signature
Re: [git-users] git showing modified files right after branch chekout
Thanks Philip, Those files are usually code files (java, as, xml, properties) and doesn't contain any non-ascii symbols. Running file command gives usually this: >file A.java A.java: ASCII text, with CRLF line terminators How else can I check that? On Thursday, April 3, 2014 11:18:35 PM UTC+4, Philip Oakley wrote: > > > Sorry for top post. > The problem *maybe* 'unicode' in that autodetect on general unicode text > (i.e. non US ASCII chars) will be detected as binary files rather than as > text files, and somehow thus different (or treated different). In > particular I believe it's that Git detects null bytes as an indicator of > binaryness. > > Can you check if those files have that characteristic? > > Philip > > - Original Message - > *From:* Stas Fedotov > *To:* git-...@googlegroups.com > *Sent:* Thursday, April 03, 2014 7:49 PM > *Subject:* Re: [git-users] git showing modified files right after branch > chekout > > I am using git on Cygwin. > > Today I figured out that this is .gitattributes file which is messing the > stuff. .gitattributes contains only > * text = auto > > After removing the file - problem was gone. > > But I still wonder why? Because the both git-scm book and github tutorial > on lineendings told that .gitattributes should solve my problem. > > > > On Thursday, April 3, 2014 10:41:38 PM UTC+4, Nelson Efrain A. Cruz wrote: >> >> Perhaps it's a problem with git for Windows. I run in a, somehow, similar >> situation using git for windows: in a branch, say branch-one, I have files >> that didn't exists in branch-two. So changing from branch-one to branch-two >> will result in all of these files that didn't exists in branch-two showing >> up like untracked files. >> >> Maybe you can try asking in the group for msysGit[1] >> >> [1] = https://groups.google.com/forum/#!forum/msysgit >> >> El abr 2, 2014 8:40 AM, "Stas Fedotov" escribió: >> >>> Hi! >>> >>> I have pretty much strange situation. Working on Windows machine and >>> committing to Git Stash. >>> >>> In my global config I have core.autocrlf=true and there is >>> .gitattributes in repo with * text = auto >>> >>> Now here is what I do on clean, recently cloned repo: >>> >>> >git status #1on develop, no changes >>> >>> >git checkout -t origin/BRANCH-1 && git status #2 >>> Branch BRANCH-1 set up to track remote branch GPIII-96 from origin. >>> Switched to a new branch 'BRANCH-1' >>> modified: A.java >>> modified: B.java >>> modified: C.java >>> >>> >file A.java >>> A.java: ASCII text, with CRLF line terminators >>> >>> >git rm --cached -r . && git reset --hard && git status >>> # On branch BRANCH-1 >>> nothing to commit (working directory clean) >>> **WTF??** >>> >>> >git checkout develop -f && git status >>> modified: D.java >>> **WTF???* **#remember on #1 it was OK* >>> >>> >git checkout BRANCH-1 -f && git status >>> modified: A.java >>> modified: B.java >>> modified: C.java >>> **WTF???** >>> >>> >>> I am really not sure if it is connected to line-endings. I just have no >>> idea how to check it. >>> >>> Any ideas on what's going on and how to fix 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+...@googlegroups.com. >>> For more options, visit https://groups.google.com/d/optout. >>> >> -- > 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+...@googlegroups.com . > For more options, visit https://groups.google.com/d/optout. > > -- 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/d/optout.
Re: [git-users] git showing modified files right after branch chekout
Sorry for top post. The problem maybe 'unicode' in that autodetect on general unicode text (i.e. non US ASCII chars) will be detected as binary files rather than as text files, and somehow thus different (or treated different). In particular I believe it's that Git detects null bytes as an indicator of binaryness. Can you check if those files have that characteristic? Philip - Original Message - From: Stas Fedotov To: git-users@googlegroups.com Sent: Thursday, April 03, 2014 7:49 PM Subject: Re: [git-users] git showing modified files right after branch chekout I am using git on Cygwin. Today I figured out that this is .gitattributes file which is messing the stuff. .gitattributes contains only * text = auto After removing the file - problem was gone. But I still wonder why? Because the both git-scm book and github tutorial on lineendings told that .gitattributes should solve my problem. On Thursday, April 3, 2014 10:41:38 PM UTC+4, Nelson Efrain A. Cruz wrote: Perhaps it's a problem with git for Windows. I run in a, somehow, similar situation using git for windows: in a branch, say branch-one, I have files that didn't exists in branch-two. So changing from branch-one to branch-two will result in all of these files that didn't exists in branch-two showing up like untracked files. Maybe you can try asking in the group for msysGit[1] [1] = https://groups.google.com/forum/#!forum/msysgit El abr 2, 2014 8:40 AM, "Stas Fedotov" escribió: Hi! I have pretty much strange situation. Working on Windows machine and committing to Git Stash. In my global config I have core.autocrlf=true and there is .gitattributes in repo with * text = auto Now here is what I do on clean, recently cloned repo: >git status #1 on develop, no changes >git checkout -t origin/BRANCH-1 && git status #2 Branch BRANCH-1 set up to track remote branch GPIII-96 from origin. Switched to a new branch 'BRANCH-1' modified: A.java modified: B.java modified: C.java >file A.java A.java: ASCII text, with CRLF line terminators >git rm --cached -r . && git reset --hard && git status # On branch BRANCH-1 nothing to commit (working directory clean) *WTF??* >git checkout develop -f && git status modified: D.java *WTF???* #remember on #1 it was OK >git checkout BRANCH-1 -f && git status modified: A.java modified: B.java modified: C.java *WTF???* I am really not sure if it is connected to line-endings. I just have no idea how to check it. Any ideas on what's going on and how to fix 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+...@googlegroups.com. For more options, visit https://groups.google.com/d/optout. -- 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/d/optout. -- 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/d/optout.
Re: [git-users] git showing modified files right after branch chekout
> From: Stas Fedotov > > I am using git on Cygwin. > > Today I figured out that this is .gitattributes file which is messing the > stuff. .gitattributes contains only > * text = auto > > After removing the file - problem was gone. > > But I still wonder why? Because the both git-scm book and github tutorial > on lineendings told that .gitattributes should solve my problem. My guess is that it involved line endings: somehow, the file as it is checked out does not match git-status's expectations, and so it is flagged as being changed. It seems like it must be a bug in some way. Dale -- 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/d/optout.
Re: [git-users] git showing modified files right after branch chekout
I am using git on Cygwin. Today I figured out that this is .gitattributes file which is messing the stuff. .gitattributes contains only * text = auto After removing the file - problem was gone. But I still wonder why? Because the both git-scm book and github tutorial on lineendings told that .gitattributes should solve my problem. On Thursday, April 3, 2014 10:41:38 PM UTC+4, Nelson Efrain A. Cruz wrote: > > Perhaps it's a problem with git for Windows. I run in a, somehow, similar > situation using git for windows: in a branch, say branch-one, I have files > that didn't exists in branch-two. So changing from branch-one to branch-two > will result in all of these files that didn't exists in branch-two showing > up like untracked files. > > Maybe you can try asking in the group for msysGit[1] > > [1] = https://groups.google.com/forum/#!forum/msysgit > > El abr 2, 2014 8:40 AM, "Stas Fedotov" > > escribió: > >> Hi! >> >> I have pretty much strange situation. Working on Windows machine and >> committing to Git Stash. >> >> In my global config I have core.autocrlf=true and there is .gitattributesin >> repo with * >> text = auto >> >> Now here is what I do on clean, recently cloned repo: >> >> >git status #1on develop, no changes >> >> >git checkout -t origin/BRANCH-1 && git status #2 >> Branch BRANCH-1 set up to track remote branch GPIII-96 from origin. >> Switched to a new branch 'BRANCH-1' >> modified: A.java >> modified: B.java >> modified: C.java >> >> >file A.java >> A.java: ASCII text, with CRLF line terminators >> >> >git rm --cached -r . && git reset --hard && git status >> # On branch BRANCH-1 >> nothing to commit (working directory clean) >> **WTF??** >> >> >git checkout develop -f && git status >> modified: D.java >> **WTF???* **#remember on #1 it was OK* >> >> >git checkout BRANCH-1 -f && git status >> modified: A.java >> modified: B.java >> modified: C.java >> **WTF???** >> >> >> I am really not sure if it is connected to line-endings. I just have no >> idea how to check it. >> >> Any ideas on what's going on and how to fix 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+...@googlegroups.com . >> For more options, visit https://groups.google.com/d/optout. >> > -- 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/d/optout.
Re: [git-users] git showing modified files right after branch chekout
Perhaps it's a problem with git for Windows. I run in a, somehow, similar situation using git for windows: in a branch, say branch-one, I have files that didn't exists in branch-two. So changing from branch-one to branch-two will result in all of these files that didn't exists in branch-two showing up like untracked files. Maybe you can try asking in the group for msysGit[1] [1] = https://groups.google.com/forum/#!forum/msysgit El abr 2, 2014 8:40 AM, "Stas Fedotov" escribió: > Hi! > > I have pretty much strange situation. Working on Windows machine and > committing to Git Stash. > > In my global config I have core.autocrlf=true and there is .gitattributesin > repo with * > text = auto > > Now here is what I do on clean, recently cloned repo: > > >git status #1on develop, no changes > > >git checkout -t origin/BRANCH-1 && git status #2 > Branch BRANCH-1 set up to track remote branch GPIII-96 from origin. > Switched to a new branch 'BRANCH-1' > modified: A.java > modified: B.java > modified: C.java > > >file A.java > A.java: ASCII text, with CRLF line terminators > > >git rm --cached -r . && git reset --hard && git status > # On branch BRANCH-1 > nothing to commit (working directory clean) > **WTF??** > > >git checkout develop -f && git status > modified: D.java > **WTF???* **#remember on #1 it was OK* > > >git checkout BRANCH-1 -f && git status > modified: A.java > modified: B.java > modified: C.java > **WTF???** > > > I am really not sure if it is connected to line-endings. I just have no > idea how to check it. > > Any ideas on what's going on and how to fix 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/d/optout. > -- 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/d/optout.
[git-users] advice for migration
I need some guidance on how to import our existing SVN repo to Git. The structure of the repo is not exactly standard. Say we have 2 versions of our app in the repo, Version1, the currently shipping version and Version2, the next version in development. The SVN structure is like /branches /Version1_some_branch /Version2_feature_branch1 /tags /Version1 /build_1 /build_2 /Version2 /build_1 /releases /Version1 /Release_1.0 /Releale_1.1 /trunk /Version1 /Version2 There's actually more but this conveys the basic structure. I'm fine with not trying to migrate the entire repo with all the history and tags and releases. There's a lot of extraneous stuff like binary files and I think we'll be better off to start relatively clean. If possible I would like to import the working trunks/branches with history. So something like /trunk/Version1 becomes the "master" branch /trunk/Version2 becomes "Version2" branch /branches/Version2_feature_branch1 becomes "Version2_feature_branch1" /branches/Version1_some_branch becomes "Version1_some_branch" Is there a way to do something like that? Thanks, Phil -- 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/d/optout.
[git-users] git aws.push stopped working after OS upgrade to Ubuntu 14.04
I've been successfully pushing my rails app to AWS electric beanstalk for several months. Earlier this week, I upgraded my dev box to Ubuntu 14.04. Now, 'git aws.push' fails when trying to push to AWS with the following error fatal: unable to access 'https://akia...81...@git.elasticbeanstalk.us-east-1.amazonaws.com/v1/repos/6f63742d73746167696e67/commitid/6366...3734/environment/6f63...6e76/': gnutls_handshake() failed: Illegal parameter It's definitely the git operation that's failing as git push -v -f https://akia...81...@git.elasticbeanstalk.us-east-1.amazonaws.com/v1/repos/6f63742d73746167696e67/commitid/6366...3734/environment/6f63...6e76/ HEAD:refs/heads/master generates the error. Pushing to my repository on Github does not generate any errors. The error isn't deterministic: occasionally a 'Decrypt error' is thrown instead of the 'Illegal parameter' error. I'm hoping someone has run into this before and there just some configuration and/or recomplie that needs to take place. Thanks in advance! -- 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/d/optout.
Re: [git-users] Wanted to setup a local git server
On your local server (to be), try doing something like: git clone --mirror This will create a bare repository on the local server which is identical to the server in the US. Have your local developers do a "git clone" from this server. This will cause "git push" to update the local git repository on the new local "server". You must then have some method to do a git push from the local server back to the US server. I don't know what OS your local server will be running (Windows or Linux ). But one way would be to have the local server do a periodic "git push" from the local repository back to the US server (using cron on Linux or "Task Scheduler" on Windows?). I am not sure, but you might be able to do the "git push" on you local server back to the US server in one of the git hooks. You will also need to do periodic "git pull" commands on your local server from the US server. One, very likely?, problem will be when someone updates the US server. When the India server tries to "git push" or "git pull", there could well be merge conflicts; which _someone_ in India would need to resolve. I will take it that the US server will remain the "authoritative" server. Also, there could be problems with people not getting timely updates between your India server and the US server. I will leave the details to the more knowledgeable people here, such as Konstantin or Thomas. On Thu, Apr 3, 2014 at 4:50 AM, Dhanesh Kumar wrote: > Hi, > > > I have a GIT server setup in US. But am working from India. So accessing > of server is slow. So I wanted to setup a local GIT server in India where > in all the developers will check-in the code and do all the operations. And > that code will be synced to the US server. Anybody has any idea on how to > do this? Can anybody help me on this? > > > Regards > Dhanesh > > -- > 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/d/optout. > -- There is nothing more pleasant than traveling and meeting new people! Genghis Khan Maranatha! <>< John McKown -- 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/d/optout.
[git-users] Wanted to setup a local git server
Hi, I have a GIT server setup in US. But am working from India. So accessing of server is slow. So I wanted to setup a local GIT server in India where in all the developers will check-in the code and do all the operations. And that code will be synced to the US server. Anybody has any idea on how to do this? Can anybody help me on this? Regards Dhanesh -- 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/d/optout.
Re: [git-users] Git Bad Pattern Error
On Wed, 2 Apr 2014 15:34:36 -0700 (PDT) akhilagarwa...@gmail.com wrote: > I was just doing "git add " > But instead of filename, I pasted some random text. > And now when I am doing any git function, it is giving an error > "git:160: bad pattern: " > Number 160 is an example, it is increasing everytime. What if you hit Ctrl-c (or Ctrl-Break on Windows) or type Ctrl-d (or Ctrl-z on Windows) or input 'q' followed by hitting the Return key? Does this help? -- 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/d/optout.
