git-cvsserver: fix breakage when calling git merge-file

diff --git a/builtin-archive.c b/builtin-archive.c
index 2df1a84b85207961a44ce2c81665c5d473e20a9c..a8a1f079bf4e28a3f07d49b6a4723ee8dea17178 100644 (file)
--- a/builtin-archive.c
+++ b/builtin-archive.c
@@ -249,7 +249,7 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
        if (remote)
                return run_remote_archiver(remote, argc, argv);
 
-       setlinebuf(stderr);
+       setvbuf(stderr, NULL, _IOLBF, BUFSIZ);
 
        memset(&ar, 0, sizeof(ar));
        tree_idx = parse_archive_args(argc, argv, &ar);