Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  Documentation: git-svn: fix example for centralized SVN clone
  Documentation: fix links to "everyday.html"
  revision.c: use proper data type in call to sizeof() within xrealloc
  • Loading branch information
Junio C Hamano committed Nov 15, 2008
2 parents a2df1fb + 9e77353 commit ea4f2bd
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
2 changes: 2 additions & 0 deletions Documentation/git-svn.txt
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,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
Expand Down
6 changes: 4 additions & 2 deletions Documentation/gitcore-tutorial.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions Documentation/gitglossary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion revision.c
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,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;
}
Expand Down

0 comments on commit ea4f2bd

Please sign in to comment.