From 0b606ad0910d6e5fdde147eda19d9edee7bd7aa9 Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Tue, 8 Nov 2011 18:20:50 +0100 Subject: [PATCH] Update the git documentation submodule url, part 2 More changes are necessary to account for the new HTML docs repository. There no longer is a "html" branch in git.git, we need to use "master" from git-htmldocs.git instead. Signed-off-by: Sebastian Schuberth Acked-by: Johannes Schindelin --- share/WinGit/HowToRelease.txt | 3 ++- share/msysGit/net/setup-msysgit.sh | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/share/WinGit/HowToRelease.txt b/share/WinGit/HowToRelease.txt index e124a999..32753151 100644 --- a/share/WinGit/HowToRelease.txt +++ b/share/WinGit/HowToRelease.txt @@ -55,7 +55,8 @@ Here is a step-by-step instruction for the maintainer: cd /doc/git/html git fetch - git checkout origin/html + git checkout master + git merge origin/master cd /share/WinGit git checkout devel diff --git a/share/msysGit/net/setup-msysgit.sh b/share/msysGit/net/setup-msysgit.sh index 8e97f7d8..824137b2 100644 --- a/share/msysGit/net/setup-msysgit.sh +++ b/share/msysGit/net/setup-msysgit.sh @@ -94,11 +94,13 @@ echo ------------------------------------------------------- case "$USE_HTTP" in t) GIT_REPO_URL=https://github.com/git/git.git + HTMLDOCS_REPO_URL=https://github.com/gitster/git-htmldocs.git MINGW_REPO_URL=http://repo.or.cz/r/git/mingw.git/ MINGW4MSYSGIT_REPO_URL=https://github.com/msysgit/git.git ;; '') GIT_REPO_URL=git://github.com/git/git + HTMLDOCS_REPO_URL=git://github.com/gitster/git-htmldocs.git MINGW_REPO_URL=git://repo.or.cz/git/mingw.git MINGW4MSYSGIT_REPO_URL=git://github.com/msysgit/git ;; @@ -137,12 +139,12 @@ echo ------------------------------------------------------- cd .. && rm -rf /doc/git/html && -git config submodule.html.url $GIT_REPO_URL && +git config submodule.html.url $HTMLDOCS_REPO_URL && mkdir -p doc/git/html && cd doc/git/html && git init && -git config remote.origin.url $GIT_REPO_URL && -git config remote.origin.fetch '+refs/heads/html:refs/remotes/origin/html' && +git config remote.origin.url $HTMLDOCS_REPO_URL && +git config remote.origin.fetch '+refs/heads/master:refs/remotes/origin/master' && git fetch origin && git checkout -l -f -q $(cd ../../.. && git ls-tree HEAD doc/git/html | sed -n "s/^160000 commit \(.*\).doc\/git\/html$/\1/p") || -- 2.11.4.GIT