From d0f19d0471792ace6d440c2789ce42227f07e69e Mon Sep 17 00:00:00 2001 From: Brandon Casey Date: Thu, 13 Nov 2008 14:20:37 -0600 Subject: [PATCH 1/3] revision.c: use proper data type in call to sizeof() within xrealloc A type char** was being used instead of char*. Signed-off-by: Junio C Hamano --- revision.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/revision.c b/revision.c index 270294af83..45fd7a3660 100644 --- a/revision.c +++ b/revision.c @@ -968,7 +968,7 @@ static void add_ignore_packed(struct rev_info *revs, const char *name) int num = ++revs->num_ignore_packed; revs->ignore_packed = xrealloc(revs->ignore_packed, - sizeof(const char **) * (num + 1)); + sizeof(const char *) * (num + 1)); revs->ignore_packed[num-1] = name; revs->ignore_packed[num] = NULL; } From de07767faefc7ee08e1842b07106aaae55a1a6df Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 14 Nov 2008 13:26:47 +0100 Subject: [PATCH 2/3] Documentation: fix links to "everyday.html" In some places the links are wrong. They should be: "link:everyday.html", instead of: "linkgit:everyday[7]". This patch fixes that. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- Documentation/gitcore-tutorial.txt | 6 ++++-- Documentation/gitglossary.txt | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt index a417e592ac..61fc5d7be8 100644 --- a/Documentation/gitcore-tutorial.txt +++ b/Documentation/gitcore-tutorial.txt @@ -1690,8 +1690,10 @@ to follow, not easier. SEE ALSO -------- -linkgit:gittutorial[7], linkgit:gittutorial-2[7], -linkgit:everyday[7], linkgit:gitcvs-migration[7], +linkgit:gittutorial[7], +linkgit:gittutorial-2[7], +linkgit:gitcvs-migration[7], +link:everyday.html[Everyday git], link:user-manual.html[The Git User's Manual] GIT diff --git a/Documentation/gitglossary.txt b/Documentation/gitglossary.txt index 565719ed5f..d77a45aed6 100644 --- a/Documentation/gitglossary.txt +++ b/Documentation/gitglossary.txt @@ -16,8 +16,10 @@ include::glossary-content.txt[] SEE ALSO -------- -linkgit:gittutorial[7], linkgit:gittutorial-2[7], -linkgit:everyday[7], linkgit:gitcvs-migration[7], +linkgit:gittutorial[7], +linkgit:gittutorial-2[7], +linkgit:gitcvs-migration[7], +link:everyday.html[Everyday git], link:user-manual.html[The Git User's Manual] GIT From 9e77353e0ea6e9e6d88ad1943570afb526d54a16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kr=C3=BCger?= Date: Fri, 14 Nov 2008 18:45:14 +0100 Subject: [PATCH 3/3] Documentation: git-svn: fix example for centralized SVN clone MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The example that tells users how to centralize the effort of the initial git svn clone operation doesn't work properly. It uses rebase but that only works if HEAD exists. This adds one extra command to create a somewhat sensible HEAD that should work in all cases. Signed-off-by: Jan Krüger Acked-by: Eric Wong Signed-off-by: Junio C Hamano --- Documentation/git-svn.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 82d03b4ced..e160b99bdb 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -522,6 +522,8 @@ have each person clone that repository with 'git-clone': git remote add origin server:/pub/project git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*' git fetch +# Create a local branch from one of the branches just fetched + git checkout -b master FETCH_HEAD # Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server) git svn init http://svn.example.com/project # Pull the latest changes from Subversion