oneway_merge(): only lstat() when told to update worktree

diff --git a/vcs-svn/line_buffer.c b/vcs-svn/line_buffer.c
index c39038723ed4a90f99f70a694eae58ba488556b6..57cc1cec033f638e6d408370039b46b653289e84 100644 (file)
--- a/vcs-svn/line_buffer.c
+++ b/vcs-svn/line_buffer.c
@@ -91,10 +91,10 @@ char *buffer_read_line(struct line_buffer *buf)
        return buf->line_buffer;
 }
 
-void buffer_read_binary(struct line_buffer *buf,
-                               struct strbuf *sb, uint32_t size)
+size_t buffer_read_binary(struct line_buffer *buf,
+                               struct strbuf *sb, size_t size)
 {
-       strbuf_fread(sb, size, buf->infile);
+       return strbuf_fread(sb, size, buf->infile);
 }
 
 off_t buffer_copy_bytes(struct line_buffer *buf, off_t nbytes)
@@ -124,7 +124,3 @@ off_t buffer_skip_bytes(struct line_buffer *buf, off_t nbytes)
        }
        return done;
 }
-
-void buffer_reset(struct line_buffer *buf)
-{
-}