IMPORTANT: development moves to git
Moderator: Moderators
Re: IMPORTANT: development moves to git
i didnt get how kdiff3 works. i can only do automerge, but not manual. i preffer meld, as it works white like my client i had for SVN. i also think it is the most windows user friendly one, though it runs unstable here :D
Re: IMPORTANT: development moves to git
This CRLF conversion thing is troubling me. The only autocrlf setting that works (does not corrupt the MSVS files) is the default one. But with this setting, GIT seems to think I have modified a lot of files, even though I have a clean checkout. So I end up picking files to commit manually. Not very nice.
Re: IMPORTANT: development moves to git
You do have a lot of CRs in your files.... Why does false not work?
Re: IMPORTANT: development moves to git
zerver: git config core.autocrlf false and then a git reset --hard should help somewhat. try toggling between false and input, too. it'll stop complaining eventually.
Re: IMPORTANT: development moves to git
It converts the MSVS files to LF and they will fail to open. Microsoft stupidity I guess.lurker wrote:You do have a lot of CRs in your files.... Why does false not work?
LOL, ok I'll try that.imbaczek wrote:zerver: git config core.autocrlf false and then a git reset --hard should help somewhat. try toggling between false and input, too. it'll stop complaining eventually.
Re: IMPORTANT: development moves to git
Yeah, it seems the trick is to use input setting during the first clone and then switch to false. Thanks baczek.
Re: IMPORTANT: development moves to git
False is supposed to not convert anything. Works for me.
Likewise, 'input' isn't supposed to convert anything when checking out.
Likewise, 'input' isn't supposed to convert anything when checking out.
Re: IMPORTANT: development moves to git
IMO someone should make one big commit converting everything to LF in the repository, so after that autocrlf = true works fine. (That also works fine with MSVC project files.)
IMO a repository with mixed line endings is close to unhandleable, because you keep having either half/full file diffs, because various otherwise good editors insist on making line endings consistent, or you keep having to change the core.autocrlf setting depending on the line ending of the files you want to commit / in the branch you are in / etc.
IMO a repository with mixed line endings is close to unhandleable, because you keep having either half/full file diffs, because various otherwise good editors insist on making line endings consistent, or you keep having to change the core.autocrlf setting depending on the line ending of the files you want to commit / in the branch you are in / etc.
Re: IMPORTANT: development moves to git
Unable to get the latest source files. Tried the following command:
And got
What can i do else to get the latest source files?
PS. I'm under win32.
Code: Select all
git clone --bare http://github.com/spring/spring.git/ spring_git
Code: Select all
Initialized empty Git repository in C:/prj/vc/spring_git/
Getting alternates list for http://github.com/spring/spring.git
Also look at http://github.com/Auswaschbar/spring.git/
Getting pack list for http://github.com/spring/spring.git
Getting index for pack a2c058911374cf87896c24904d1660a68227e362
Getting index for pack 3d39d8b72cb25a8ea1c7ebc4da16ad8df9fe1965
Getting index for pack a49d844b48738e49fefe647bbf160f586aa4a038
Getting index for pack 252a9dc10aab7d88855b0eb3dbcf50f3ba195f00
Getting index for pack 83374796de51634227460a2f98ffaa83138551cf
Getting index for pack e5f1ebb0da74ceb1f5ba1cc3637c81b6ff1de528
Getting index for pack f8364dc668d54f5ad34fdadfcd8d1389c4b65364
Getting pack list for http://github.com/Auswaschbar/spring.git/
error: Unable to find 0000000000000000000000000000000000000000 under http://github.com/spring/spring.git
Cannot obtain needed object 0000000000000000000000000000000000000000
fatal: Fetch failed.
PS. I'm under win32.
Re: IMPORTANT: development moves to git
git clone http://github.com/spring/spring.git/ spring_git
should be enough.
should be enough.
Re: IMPORTANT: development moves to git
I tried before. Same result.
Re: IMPORTANT: development moves to git
use git://, not http://
git clone git://github.com/spring/spring.git
also, git clone --bare is probably not what you want; if you want the sources without history, use git clone --depth 0
git clone git://github.com/spring/spring.git
also, git clone --bare is probably not what you want; if you want the sources without history, use git clone --depth 0
Re: IMPORTANT: development moves to git
Today github is fucked
git clone git://github.com/spring/spring.git
remote: Total 0 (delta 0), reused 0 (delta 0)[K
remote: aborting due to possible repository corruption on the remote side.
fatal: error in sideband demultiplexer
git pull results in even more strange errors.
git clone git://github.com/spring/spring.git
remote: Total 0 (delta 0), reused 0 (delta 0)[K
remote: aborting due to possible repository corruption on the remote side.
fatal: error in sideband demultiplexer
git pull results in even more strange errors.
Re: IMPORTANT: development moves to git
Me and Auswaschbar have already spammed support.github.com with this, awaiting answers.
Re: IMPORTANT: development moves to git
Maybe this is how the github staff is celebrating April Fools' Day
Re: IMPORTANT: development moves to git
i pushed master to http://gitorious.org/projects/spring-rts/repos/mainline, use that if you want to clone and/or fetch doesn't work for you.
Re: IMPORTANT: development moves to git
How much time should we give github to fix this problem before we create a new repo or move somewhere else?
Re: IMPORTANT: development moves to git
When doing a non-anonymous clone I got this:
The "bad object" being:
Re-pushing the history will probably fix it, but IMHO random repository corruption like this should just not happen ever.
Code: Select all
git clone git@github.com:spring/spring.git
(authentication etc.)
error: missing object referenced by 'refs/tags/0.70b1'
error: missing object referenced by 'refs/tags/0.70b2'
error: missing object referenced by 'refs/tags/0.70b3'
error: missing object referenced by 'refs/tags/0.71b1'
error: missing object referenced by 'refs/tags/0.72b1'
error: missing object referenced by 'refs/tags/0.73b1'
error: missing object referenced by 'refs/tags/0.74b1'
error: missing object referenced by 'refs/tags/0.74b2'
error: missing object referenced by 'refs/tags/0.74b3'
error: missing object referenced by 'refs/tags/0.75b1'
error: missing object referenced by 'refs/tags/0.75b2'
error: missing object referenced by 'refs/tags/0.76b1'
error: missing object referenced by 'refs/tags/0.77b1'
error: missing object referenced by 'refs/tags/0.77b2'
error: missing object referenced by 'refs/tags/0.77b3'
error: missing object referenced by 'refs/tags/0.77b4'
error: missing object referenced by 'refs/tags/0.77b5'
fatal: bad object 204d3269b8d7641ed40f6209c34a6da9459b1373
remote: Total 0 (delta 0), reused 0 (delta 0)
remote: aborting due to possible repository corruption on the remote side.
error: waitpid (async) failed
fatal: error in sideband demultiplexer
error: waitpid (async) failed
fatal: git-upload-pack: aborting due to possible repository corruption on the remote side.
Code: Select all
git show 204d3269b8d7641ed40f6209c34a6da9459b1373
commit 204d3269b8d7641ed40f6209c34a6da9459b1373
Author: jcnossen <jcnossen@37977431-3df6-0310-b722-df95706aa16b>
Date: Fri Feb 24 22:07:12 2006 +0000
fixed a win specific crash when running spring without path in argv[0]
git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@867 37977431-3df6-0310-b722-df95706aa16b
diff --git a/rts/System/Main.cpp b/rts/System/Main.cpp
index c057450..aa1a349 100644
--- a/rts/System/Main.cpp
+++ b/rts/System/Main.cpp
@@ -322,13 +322,18 @@ void SpringApp::CheckCmdLineFile(int argc, char *argv[])
{
// Check if the commandline parameter is specifying a demo file
#ifdef _WIN32
- string command(argv[0]);
- int idx = command.rfind("spring");
- string path = command.substr(0,idx);
- if (path.at(0) == '"')
- path.append(1,'"');
- if (path != "")
+ // find the correct dir
+ const char *arg0=argv[0];
+ int a,s = strlen(arg0);
+ for (a=s-1;a>0;a--)
+ if (arg0[a] == '\\') break;
+ if (a > 0) {
+ string path;
+ path.insert (0, arg0, arg0+a);
+ if (path.at(0) == '"')
+ path.append(1,'"');
_chdir(path.c_str());
+ }
#endif
for (int i = 1; i < argc; i++) {
-
- Posts: 933
- Joined: 27 Feb 2006, 02:04
Re: IMPORTANT: development moves to git
Github failed because of a datacenter issue explained here: http://blog.engineyard.com/2009/03/31/march-30th-outage
Honestly I don't think I can lay blame on any of the parties involved. Seems like a "One in a million" type of failure.
Honestly I don't think I can lay blame on any of the parties involved. Seems like a "One in a million" type of failure.
Re: IMPORTANT: development moves to git
i don't think our problem and that connectivity problem they had are related, unless it was replication that went wrong, which shouldn't happen.