diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-05-03 04:02:15 (GMT) |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2011-05-03 04:02:15 (GMT) |
| commit | 59445b0b02c731872c8665ac7e9cf1226fa616e4 (patch) | |
| tree | 93922cf13ed9c62859dac628fa7e376977a23d24 /vcs-svn/repo_tree.c | |
| parent | 6908e999468d7eb531a1609cee37673c5d3ca04f (diff) | |
| parent | ec014eac0e9e6f30cbbca616090fa2ecf74797e7 (diff) | |
| download | git-59445b0b02c731872c8665ac7e9cf1226fa616e4.zip git-59445b0b02c731872c8665ac7e9cf1226fa616e4.tar.gz git-59445b0b02c731872c8665ac7e9cf1226fa616e4.tar.bz2 | |
Merge commit 'v1.7.5' into svn-fe
* commit 'v1.7.5': (436 commits)
Git 1.7.5
Git 1.7.5-rc3
Git 1.7.4.5
git-svn.txt: Document --mergeinfo
Revert "run-command: prettify -D_FORTIFY_SOURCE workaround"
...
Diffstat (limited to 'vcs-svn/repo_tree.c')
| -rw-r--r-- | vcs-svn/repo_tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcs-svn/repo_tree.c b/vcs-svn/repo_tree.c index 8caa015..a21d89d 100644 --- a/vcs-svn/repo_tree.c +++ b/vcs-svn/repo_tree.c @@ -38,7 +38,7 @@ static uint32_t mark; static int repo_dirent_name_cmp(const void *a, const void *b); /* Treap for directory entries */ -trp_gen(static, dent_, struct repo_dirent, children, dent, repo_dirent_name_cmp); +trp_gen(static, dent_, struct repo_dirent, children, dent, repo_dirent_name_cmp) uint32_t next_blob_mark(void) { |