diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-30 10:49:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-30 10:49:13 -0700 |
| commit | 44a9cedb005b0b8be31dccd8e6ddf97074a01345 (patch) | |
| tree | c32849c1c9c498cc7d2ab4072c4dfbbcee0e97c9 /vcs-svn | |
| parent | 537d99033749591245ddd36f7317fd6b8555d803 (diff) | |
| parent | a892a2ddfefca2e25d595bb685c8853d023fde0a (diff) | |
| download | git-44a9cedb005b0b8be31dccd8e6ddf97074a01345.tar.gz | |
Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
* 'svn-fe' of git://repo.or.cz/git/jrn:
tests: kill backgrounded processes more robustly
vcs-svn: a void function shouldn't try to return something
tests: make sure input to sed is newline terminated
vcs-svn: add missing cast to printf argument
Diffstat (limited to 'vcs-svn')
| -rw-r--r-- | vcs-svn/svndump.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c index eef49ca192..572a995966 100644 --- a/vcs-svn/svndump.c +++ b/vcs-svn/svndump.c @@ -214,7 +214,8 @@ static void handle_node(void) if (have_text || have_props || node_ctx.srcRev) die("invalid dump: deletion node has " "copyfrom info, text, or properties"); - return repo_delete(node_ctx.dst); + repo_delete(node_ctx.dst); + return; } if (node_ctx.action == NODEACT_REPLACE) { repo_delete(node_ctx.dst); |