[git-users] Folding submodules into parent repo with subtree?
I'm planning on getting rid of the submodules my predecessor set up and I've tried to find a nice way of doing it. I'd like to keep the history from the submodules intact. My experimentation with `git subtree` suggests that'll work well, but maybe I'm missing something, is there a better way of folding submodules into a parent repo? /M -- Magnus Therning OpenPGP: 0xAB4DFBA4 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus There does not now, nor will there ever, exist a programming language in which it is the least bit hard to write bad programs. -- Flon's Axiom -- 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] Re: Exceptions when cloning a perforce repository "string index out of range" (git-p4 v.2.5.0)
On Monday, August 17, 2015 at 1:39:42 PM UTC+1, Damien GERARD wrote: > > I am trying to import a full perforce repository, and I've got the > following exception: > > File "/home/dgerard/libexec/git-core/git-p4", line 3287, in > main() > File "/home/dgerard/libexec/git-core/git-p4", line 3281, in main > if not cmd.run(args): > File "/home/dgerard/libexec/git-core/git-p4", line 3155, in run > if not P4Sync.run(self, depotPaths): > File "/home/dgerard/libexec/git-core/git-p4", line 3008, in run > self.importChanges(changes) > File "/home/dgerard/libexec/git-core/git-p4", line 2680, in importChanges > self.initialParent) > File "/home/dgerard/libexec/git-core/git-p4", line 2304, in commit > self.streamP4Files(new_files) > File "/home/dgerard/libexec/git-core/git-p4", line 2218, in streamP4Files > cb=streamP4FilesCbSelf) > File "/home/dgerard/libexec/git-core/git-p4", line 482, in p4CmdList > cb(entry) > File "/home/dgerard/libexec/git-core/git-p4", line 2212, in > streamP4FilesCbSelf > self.streamP4FilesCb(entry) > File "/home/dgerard/libexec/git-core/git-p4", line 2167, in > streamP4FilesCb > self.streamOneP4File(self.stream_file, self.stream_contents) > File "/home/dgerard/libexec/git-core/git-p4", line 2078, in > streamOneP4File > if data[-1] == '\n': > IndexError: string index out of range > > > The p4 repository is private but I can do some digging. > > git: v2.5.0, ubuntu 15.10 (compiled from sources/tag) > Can you try with -v turned on? Looks like it might be a problem file of some sort. i.e. git p4 clone //depot/whatever -v -- 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] SSL3 error on git clone under windows with git 2.5
Hi, i use git on windows 10, behind a SSL company proxy with self-signed certificate bypassed with cntlm with certificate added to custom curl-ca-bundle.crt file starting with Git 2.5 when i do a git clone 'https://**@bitbucket.org//.git/' i receive below error: *fatal: unable to access 'https://x...@bitbucket.org//.git/': error:14082174:SSL routines:ssl3_check_cert_and_algorithm:dh key too small* probably this problem is related to poor quality of the self signed certificate but I can't change the certificate itself (is out of my control) *Note that:* * - *If you see is a redacted value for security/privacy but this is not relevant - I can't rebuild the self-signed certificate (is out of my control) - I've already try with git config https.sslVerify false (even with --global to be sure... ) - with previous git version this problem not happen below my own configuration: git config --list core.symlinks=false core.autocrlf=true color.diff=auto color.status=auto color.branch=auto color.interactive=true pack.packsizelimit=2g help.format=html http.sslcainfo=C:/Program Files/Git/mingw64/ssl/certs/ca-bundle.crt diff.astextplain.textconv=astextplain rebase.autosquash=true http.proxy=http://localhost: http.sslcainfo=c:/Users//curl-ca-bundle.crt https.proxy=https://localhost: https.sslcainfo=c:/Users//curl-ca-bundle.crt there is a way to fix this problem? -- 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.
