From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 26 Mar 2011 18:35:41 +0000 (-0700)
Subject: Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
X-Git-Tag: v1.7.5-rc0~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a080fdd1b15612f71e5cc660c108f7d6c03804dd?ds=inline;hp=-c

Merge branch 'svn-fe' of git://repo.or.cz/git/jrn

* 'svn-fe' of git://repo.or.cz/git/jrn:
vcs-svn: handle log message with embedded NUL
vcs-svn: avoid unnecessary copying of log message and author
vcs-svn: remove buffer_read_string
vcs-svn: make reading of properties binary-safe
---

a080fdd1b15612f71e5cc660c108f7d6c03804dd
diff --combined vcs-svn/repo_tree.c
index 632dbd8736,8caa0159d1..a21d89de97
--- a/vcs-svn/repo_tree.c
+++ b/vcs-svn/repo_tree.c
@@@ -38,7 -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)
  {
@@@ -278,8 -278,9 +278,9 @@@ void repo_diff(uint32_t r1, uint32_t r2
  		    repo_commit_root_dir(commit_pointer(r2)));
  }
  
- void repo_commit(uint32_t revision, const char *author, char *log,
- 		 const char *uuid, const char *url, unsigned long timestamp)
+ void repo_commit(uint32_t revision, const char *author,
+ 		const struct strbuf *log, const char *uuid, const char *url,
+ 		unsigned long timestamp)
  {
  	fast_export_commit(revision, author, log, uuid, url, timestamp);
  	dent_commit();