Skip to content

Commit a62bbf8

Browse files
committed
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
2 parents b1c9b79 + 9e8c532 commit a62bbf8

File tree

7 files changed

+855
-89
lines changed

7 files changed

+855
-89
lines changed

contrib/svn-fe/svn-fe.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
int main(int argc, char **argv)
1010
{
11-
svndump_init(NULL);
11+
if (svndump_init(NULL))
12+
return 1;
1213
svndump_read((argc > 1) ? argv[1] : NULL);
1314
svndump_deinit();
1415
svndump_reset();

0 commit comments

Comments
 (0)