@matheusbsbs / matheus-bagliano / commits / 162f412921
Fork 0

git-svn: support -C<num> passing to git-diff-tree

The repo-config key is 'svn.copysimilarity' Signed-off-by: Eric Wong <normalperson@yhbt.net>

Eric Wong committed May 14, 2006 at 20:00 UTC 162f41292167a800432fc6bbacfcd9f93a90b0c8
1 file changed +9 -2
contrib/git-svn/git-svn.perl
+9 -2
@@ -33,7 +33,8 @@ use POSIX qw/strftime/;
33 my $sha1 = qr/[a-f\d]{40}/;
34 my $sha1_short = qr/[a-f\d]{4,40}/;
35 my ($_revision,$_stdin,$_no_ignore_ext,$_no_stop_copy,$_help,$_rmdir,$_edit,
36 - $_find_copies_harder, $_l, $_version, $_upgrade, $_authors);
36 + $_find_copies_harder, $_l, $_cp_similarity,
37 + $_version, $_upgrade, $_authors);
38 my (@_branch_from, %tree_map, %users);
39 my ($_svn_co_url_revs, $_svn_pg_peg_revs);
40
@@ -55,6 +56,7 @@ my %cmd = (
56 'rmdir' => \$_rmdir,
57 'find-copies-harder' => \$_find_copies_harder,
58 'l=i' => \$_l,
59 + 'copy-similarity|C=i'=> \$_cp_similarity,
60 %fc_opts,
61 } ],
62 'show-ignore' => [ \&show_ignore, "Show svn:ignore listings", { } ],
@@ -580,7 +582,12 @@ sub svn_checkout_tree {
582 my $pid = open my $diff_fh, '-|';
583 defined $pid or croak $!;
584 if ($pid == 0) {
583 - my @diff_tree = qw(git-diff-tree -z -r -C);
585 + my @diff_tree = qw(git-diff-tree -z -r);
586 + if ($_cp_similarity) {
587 + push @diff_tree, "-C$_cp_similarity";
588 + } else {
589 + push @diff_tree, '-C';
590 + }
591 push @diff_tree, '--find-copies-harder' if $_find_copies_harder;
592 push @diff_tree, "-l$_l" if defined $_l;
593 exec(@diff_tree, $from, $treeish) or croak $!;