summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-06-21 10:03:58 (GMT)
committerJonathan Nieder <jrnieder@gmail.com>2011-06-21 10:03:58 (GMT)
commite3ed67a3d55aca54bdbdabaa57f73d73a0af0fe6 (patch)
tree378bbc256a49756576dd40c24343fede945215d6
parente09ab7d936870d57d2219bd70d96faa51805c042 (diff)
parentc5f1fbe7bc6b29f3343a168461ee70816ddebec2 (diff)
downloadgit-e3ed67a3d55aca54bdbdabaa57f73d73a0af0fe6.zip
git-e3ed67a3d55aca54bdbdabaa57f73d73a0af0fe6.tar.gz
git-e3ed67a3d55aca54bdbdabaa57f73d73a0af0fe6.tar.bz2
Merge branch 'db/text-delta' into svn-fe
* db/text-delta: vcs-svn: do not initialize report_buffer twice
-rw-r--r--vcs-svn/fast_export.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/vcs-svn/fast_export.c b/vcs-svn/fast_export.c
index 97f5fdf..3efde20 100644
--- a/vcs-svn/fast_export.c
+++ b/vcs-svn/fast_export.c
@@ -14,7 +14,6 @@
#include "line_buffer.h"
#define MAX_GITSVN_LINE_LEN 4096
-#define REPORT_FILENO 3
static uint32_t first_commit_done;
static struct line_buffer postimage = LINE_BUFFER_INIT;
@@ -30,15 +29,6 @@ static int init_postimage(void)
return buffer_tmpfile_init(&postimage);
}
-static int init_report_buffer(int fd)
-{
- static int report_buffer_initialized;
- if (report_buffer_initialized)
- return 0;
- report_buffer_initialized = 1;
- return buffer_fdinit(&report_buffer, fd);
-}
-
void fast_export_init(int fd)
{
if (buffer_fdinit(&report_buffer, fd))
@@ -203,8 +193,6 @@ static long apply_delta(off_t len, struct line_buffer *input,
if (init_postimage() || !(out = buffer_tmpfile_rewind(&postimage)))
die("cannot open temporary file for blob retrieval");
- if (init_report_buffer(REPORT_FILENO))
- die("cannot open fd 3 for feedback from fast-import");
if (old_data) {
const char *response;
printf("cat-blob %s\n", old_data);