summaryrefslogtreecommitdiff
path: root/contrib/svn-fe
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-02-26 11:21:29 (GMT)
committerJonathan Nieder <jrnieder@gmail.com>2011-02-26 11:21:29 (GMT)
commita62bbf8f01c6b19cd1a5cf92a98f612176aa2b67 (patch)
treebd50276e3e4d2bacd5890a962f8db06414c251f0 /contrib/svn-fe
parentb1c9b798a6dd391aeaea31663a65164815701244 (diff)
parent9e8c532108b9078812f23c53a2df3509e7ce71bf (diff)
downloadgit-a62bbf8f01c6b19cd1a5cf92a98f612176aa2b67.zip
git-a62bbf8f01c6b19cd1a5cf92a98f612176aa2b67.tar.gz
git-a62bbf8f01c6b19cd1a5cf92a98f612176aa2b67.tar.bz2
Merge commit 'jn/svn-fe' of git://github.com/gitster/git into svn-fe
* git://github.com/gitster/git: vcs-svn: Allow change nodes for root of tree (/) vcs-svn: Implement Prop-delta handling vcs-svn: Sharpen parsing of property lines vcs-svn: Split off function for handling of individual properties vcs-svn: Make source easier to read on small screens vcs-svn: More dump format sanity checks vcs-svn: Reject path nodes without Node-action vcs-svn: Delay read of per-path properties vcs-svn: Combine repo_replace and repo_modify functions vcs-svn: Replace = Delete + Add vcs-svn: handle_node: Handle deletion case early vcs-svn: Use mark to indicate nodes with included text vcs-svn: Unclutter handle_node by introducing have_props var vcs-svn: Eliminate node_ctx.mark global vcs-svn: Eliminate node_ctx.srcRev global vcs-svn: Check for errors from open() vcs-svn: Allow simple v3 dumps (no deltas yet) Conflicts: t/t9010-svn-fe.sh vcs-svn/svndump.c
Diffstat (limited to 'contrib/svn-fe')
-rw-r--r--contrib/svn-fe/svn-fe.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/svn-fe/svn-fe.c b/contrib/svn-fe/svn-fe.c
index a2677b0..35db24f 100644
--- a/contrib/svn-fe/svn-fe.c
+++ b/contrib/svn-fe/svn-fe.c
@@ -8,7 +8,8 @@
int main(int argc, char **argv)
{
- svndump_init(NULL);
+ if (svndump_init(NULL))
+ return 1;
svndump_read((argc > 1) ? argv[1] : NULL);
svndump_deinit();
svndump_reset();