diff options
author | Thomas Rast <trast@student.ethz.ch> | 2010-10-18 15:11:25 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-10-19 14:15:59 -0700 |
commit | 1bb28d87e1d8897db662f48455d369860758fbdd (patch) | |
tree | e8aaa30537c6a8cc4c2919ddcac183fc4b907cf5 | |
parent | c7deb8dac1f24498a353327ec9fceb99695582c2 (diff) | |
download | git-1bb28d87e1d8897db662f48455d369860758fbdd.tar.gz |
{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 <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-x | contrib/examples/git-svnimport.perl | 2 | ||||
-rwxr-xr-x | 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 4576c4a862..6c4cab3633 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 9e03eee458..7ab7bbc9ea 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; |