aboutsummaryrefslogtreecommitdiff
path: root/vcs-svn/fast_export.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-03-22 18:19:46 -0500
committerJonathan Nieder <jrnieder@gmail.com>2011-03-22 18:19:46 -0500
commitfa6c4bceabdb7bc4bf8946c4887f08e9765f5ff6 (patch)
tree032e619da9cece255ca86279fb18ccb87fd83371 /vcs-svn/fast_export.c
parent5c674860eb8bfa1a8c0038fc2d32c4fc205e9d62 (diff)
parent7c5817d3ba111bb71a5d7e3c8526e0925f96c92d (diff)
downloadgit-fa6c4bceabdb7bc4bf8946c4887f08e9765f5ff6.tar.gz
git-fa6c4bceabdb7bc4bf8946c4887f08e9765f5ff6.tar.xz
Merge branch 'db/strbufs-for-metadata' into db/svn-fe-code-purge
* db/strbufs-for-metadata: vcs-svn: use strbuf for author, UUID, and URL vcs-svn: use strbuf for revision log Conflicts: vcs-svn/fast_export.c vcs-svn/fast_export.h vcs-svn/repo_tree.c vcs-svn/svndump.c
Diffstat (limited to 'vcs-svn/fast_export.c')
-rw-r--r--vcs-svn/fast_export.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/vcs-svn/fast_export.c b/vcs-svn/fast_export.c
index 32f0c8cfc..a64a3c563 100644
--- a/vcs-svn/fast_export.c
+++ b/vcs-svn/fast_export.c
@@ -59,25 +59,25 @@ void fast_export_modify(uint32_t depth, const uint32_t *path, uint32_t mode,
}
static char gitsvnline[MAX_GITSVN_LINE_LEN];
-void fast_export_begin_commit(uint32_t revision, uint32_t author, char *log,
- uint32_t uuid, uint32_t url,
+void fast_export_begin_commit(uint32_t revision, const char *author, char *log,
+ const char *uuid, const char *url,
unsigned long timestamp)
{
if (!log)
log = "";
- if (~uuid && ~url) {
+ if (*uuid && *url) {
snprintf(gitsvnline, MAX_GITSVN_LINE_LEN,
"\n\ngit-svn-id: %s@%"PRIu32" %s\n",
- pool_fetch(url), revision, pool_fetch(uuid));
+ url, revision, uuid);
} else {
*gitsvnline = '\0';
}
printf("commit refs/heads/master\n");
printf("mark :%"PRIu32"\n", revision);
printf("committer %s <%s@%s> %ld +0000\n",
- ~author ? pool_fetch(author) : "nobody",
- ~author ? pool_fetch(author) : "nobody",
- ~uuid ? pool_fetch(uuid) : "local", timestamp);
+ *author ? author : "nobody",
+ *author ? author : "nobody",
+ *uuid ? uuid : "local", timestamp);
printf("data %"PRIu32"\n%s%s\n",
(uint32_t) (strlen(log) + strlen(gitsvnline)),
log, gitsvnline);