Skip to content

Commit ea4f2bd

Browse files
committed
Merge branch 'maint'
* 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
2 parents a2df1fb + 9e77353 commit ea4f2bd

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

Documentation/git-svn.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -544,6 +544,8 @@ have each person clone that repository with 'git-clone':
544544
git remote add origin server:/pub/project
545545
git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
546546
git fetch
547+
# Create a local branch from one of the branches just fetched
548+
git checkout -b master FETCH_HEAD
547549
# Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server)
548550
git svn init http://svn.example.com/project
549551
# Pull the latest changes from Subversion

Documentation/gitcore-tutorial.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1690,8 +1690,10 @@ to follow, not easier.
16901690

16911691
SEE ALSO
16921692
--------
1693-
linkgit:gittutorial[7], linkgit:gittutorial-2[7],
1694-
linkgit:everyday[7], linkgit:gitcvs-migration[7],
1693+
linkgit:gittutorial[7],
1694+
linkgit:gittutorial-2[7],
1695+
linkgit:gitcvs-migration[7],
1696+
link:everyday.html[Everyday git],
16951697
link:user-manual.html[The Git User's Manual]
16961698

16971699
GIT

Documentation/gitglossary.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ include::glossary-content.txt[]
1616

1717
SEE ALSO
1818
--------
19-
linkgit:gittutorial[7], linkgit:gittutorial-2[7],
20-
linkgit:everyday[7], linkgit:gitcvs-migration[7],
19+
linkgit:gittutorial[7],
20+
linkgit:gittutorial-2[7],
21+
linkgit:gitcvs-migration[7],
22+
link:everyday.html[Everyday git],
2123
link:user-manual.html[The Git User's Manual]
2224

2325
GIT

revision.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -995,7 +995,7 @@ static void add_ignore_packed(struct rev_info *revs, const char *name)
995995
int num = ++revs->num_ignore_packed;
996996

997997
revs->ignore_packed = xrealloc(revs->ignore_packed,
998-
sizeof(const char **) * (num + 1));
998+
sizeof(const char *) * (num + 1));
999999
revs->ignore_packed[num-1] = name;
10001000
revs->ignore_packed[num] = NULL;
10011001
}

0 commit comments

Comments
 (0)