Skip to content

Commit

Permalink
{cvs,svn}import: use the new 'git read-tree --empty'
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Rast authored and Junio C Hamano committed Oct 19, 2010
1 parent c7deb8d commit 1bb28d8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion contrib/examples/git-svnimport.perl
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ ($$)
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;
Expand Down
2 changes: 1 addition & 1 deletion git-cvsimport.perl
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ sub munge_user_filename {
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;
Expand Down

0 comments on commit 1bb28d8

Please sign in to comment.