From 1bb28d87e1d8897db662f48455d369860758fbdd Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Mon, 18 Oct 2010 15:11:25 +0200 Subject: [PATCH] {cvs,svn}import: use the new 'git read-tree --empty' Since fb1bb96 (read-tree: deprecate syntax without tree-ish args, 2010-09-10) not passing --empty caused a spurious warning that was shown to the user. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- contrib/examples/git-svnimport.perl | 2 +- git-cvsimport.perl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/examples/git-svnimport.perl b/contrib/examples/git-svnimport.perl index 4576c4a86..6c4cab363 100755 --- a/contrib/examples/git-svnimport.perl +++ b/contrib/examples/git-svnimport.perl @@ -289,7 +289,7 @@ my $current_rev = $opt_s || 1; unless(-d $git_dir) { system("git init"); die "Cannot init the GIT db at $git_tree: $?\n" if $?; - system("git read-tree"); + system("git read-tree --empty"); die "Cannot init an empty tree: $?\n" if $?; $last_branch = $opt_o; diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 9e03eee45..7ab7bbc9e 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -611,7 +611,7 @@ my %index; # holds filenames of one index per branch unless (-d $git_dir) { system(qw(git init)); die "Cannot init the GIT db at $git_tree: $?\n" if $?; - system(qw(git read-tree)); + system(qw(git read-tree --empty)); die "Cannot init an empty tree: $?\n" if $?; $last_branch = $opt_o; -- 2.30.2