Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
We moved to github.com
Browse files Browse the repository at this point in the history
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Sep 12, 2011
1 parent 9f3a205 commit a7ba4ad
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "git"]
path = git
url = git://repo.or.cz/git/mingw/4msysgit.git/
url = git://github.com/msysgit/git
[submodule "html"]
path = doc/git/html
url = git://git.kernel.org/pub/scm/git/git.git
Expand Down
6 changes: 3 additions & 3 deletions share/msysGit/initialize.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/bin/sh

# This script initializes /.git from msysgit.git on repo.or.cz
# This script initializes /.git from msysgit/msysgit on github.com

test -d /git/.git || {
cd /git &&
git init &&
git config core.autocrlf false &&
git remote add -f origin \
mob@repo.or.cz:/srv/git/git/mingw/4msysgit.git &&
git://github.com/msysgit/git &&
if test ! -f /etc/full-git-sha1 ||
! git reset $(cat /etc/full-git-sha1)
then
Expand All @@ -23,7 +23,7 @@ test -d /.git || {
cd / &&
git init &&
git config core.autocrlf false &&
git remote add -f origin mob@repo.or.cz:/srv/git/msysgit.git &&
git remote add -f origin git://github.com/msysgit/msysgit &&
if test ! -f /etc/full-msysgit-sha1 ||
! git reset $(cat /etc/full-msysgit-sha1)
then
Expand Down
1 change: 1 addition & 0 deletions share/msysGit/net/fileList-mingw.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
bin/curl.exe
bin/curl-ca-bundle.crt
bin/libcrypto.dll
bin/libcurl-4.dll
bin/libiconv-2.dll
Expand Down
1 change: 1 addition & 0 deletions share/msysGit/net/fileList.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ libexec/git-core/git-index-pack.exe
libexec/git-core/git-sh-setup
libexec/git-core/git-submodule
libexec/git-core/git-remote-http.exe
libexec/git-core/git-remote-https.exe
bin/cat.exe
bin/expr.exe
bin/mkdir.exe
Expand Down
21 changes: 7 additions & 14 deletions share/msysGit/net/setup-msysgit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ echo
echo -------------------------------------------------------
echo Fetching the latest MSys environment
echo -------------------------------------------------------
MSYSGIT_REPO_GIT=git://repo.or.cz/msysgit.git
MSYSGIT_REPO_GIT_MOB=ssh://mob@repo.or.cz/srv/git/msysgit.git
MSYSGIT_REPO_HTTP=http://repo.or.cz/r/msysgit.git
MSYSGIT_REPO_GIT=git://github.com/msysgit/msysgit
MSYSGIT_REPO_HTTP=https://github.com/msysgit/msysgit.git

# Multiply git.exe

Expand All @@ -48,16 +47,14 @@ do
"$INSTALL_PATH/installer-tmp/bin/git-$builtin.exe"
done

git config --system http.sslCAinfo /bin/curl-ca-bundle.crt
git init &&
git config core.autocrlf false &&
git config remote.origin.url $MSYSGIT_REPO_GIT &&
git config remote.origin.fetch \
+refs/heads/@@MSYSGITBRANCH@@:refs/remotes/origin/@@MSYSGITBRANCH@@ &&
git config branch.@@MSYSGITBRANCH@@.remote origin &&
git config branch.@@MSYSGITBRANCH@@.merge refs/heads/@@MSYSGITBRANCH@@ &&
git config remote.mob.url $MSYSGIT_REPO_GIT_MOB &&
git config remote.mob.fetch +refs/heads/@@MSYSGITBRANCH@@:refs/remotes/origin/mob &&
git config remote.mob.push HEAD:mob &&

USE_HTTP=
git fetch || {
Expand Down Expand Up @@ -96,17 +93,16 @@ echo -------------------------------------------------------

case "$USE_HTTP" in
t)
GIT_REPO_URL=http://repo.or.cz/r/git.git/
GIT_REPO_URL=https://github.com/git/git.git
MINGW_REPO_URL=http://repo.or.cz/r/git/mingw.git/
MINGW4MSYSGIT_REPO_URL=http://repo.or.cz/r/git/mingw/4msysgit.git/
MINGW4MSYSGIT_REPO_URL=https://github.com/msysgit/git.git
;;
'')
GIT_REPO_URL=git://repo.or.cz/git.git
GIT_REPO_URL=git://github.com/git/git
MINGW_REPO_URL=git://repo.or.cz/git/mingw.git
MINGW4MSYSGIT_REPO_URL=git://repo.or.cz/git/mingw/4msysgit.git
MINGW4MSYSGIT_REPO_URL=git://github.com/msysgit/git
;;
esac
MINGW4MSYSGIT_MOB_URL=ssh://mob@repo.or.cz/srv/git/git/mingw/4msysgit.git

git config submodule.git.url $MINGW4MSYSGIT_REPO_URL &&
mkdir -p git &&
Expand All @@ -121,9 +117,6 @@ git config remote.mingw.fetch '+refs/heads/*:refs/remotes/mingw/*' &&
git fetch --tags mingw &&
git config remote.origin.url $MINGW4MSYSGIT_REPO_URL &&
git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*' &&
git config remote.mob.url $MINGW4MSYSGIT_MOB_URL &&
git config remote.mob.fetch '+refs/heads/*:refs/remotes/origin/*' &&
git config remote.mob.push 'HEAD:mob' &&
git fetch --tags origin &&
if test -z "@@FOURMSYSGITBRANCH@@"
then
Expand Down

0 comments on commit a7ba4ad

Please sign in to comment.