diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-05-14 20:00:00 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2006-06-16 03:04:19 -0700 |
| commit | 162f41292167a800432fc6bbacfcd9f93a90b0c8 (patch) | |
| tree | 4087155c0cac3e17046a2da19e6758bf6192457a | |
| parent | b63af9b340dd831840c70103c9f609940a910031 (diff) | |
| download | git-162f41292167a800432fc6bbacfcd9f93a90b0c8.tar.gz git-162f41292167a800432fc6bbacfcd9f93a90b0c8.tar.xz | |
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>
| -rwxr-xr-x | contrib/git-svn/git-svn.perl | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl index 72129de6a..089d597d2 100755 --- a/contrib/git-svn/git-svn.perl +++ b/contrib/git-svn/git-svn.perl @@ -33,7 +33,8 @@ use POSIX qw/strftime/; my $sha1 = qr/[a-f\d]{40}/; my $sha1_short = qr/[a-f\d]{4,40}/; my ($_revision,$_stdin,$_no_ignore_ext,$_no_stop_copy,$_help,$_rmdir,$_edit, - $_find_copies_harder, $_l, $_version, $_upgrade, $_authors); + $_find_copies_harder, $_l, $_cp_similarity, + $_version, $_upgrade, $_authors); my (@_branch_from, %tree_map, %users); my ($_svn_co_url_revs, $_svn_pg_peg_revs); @@ -55,6 +56,7 @@ my %cmd = ( 'rmdir' => \$_rmdir, 'find-copies-harder' => \$_find_copies_harder, 'l=i' => \$_l, + 'copy-similarity|C=i'=> \$_cp_similarity, %fc_opts, } ], 'show-ignore' => [ \&show_ignore, "Show svn:ignore listings", { } ], @@ -580,7 +582,12 @@ sub svn_checkout_tree { my $pid = open my $diff_fh, '-|'; defined $pid or croak $!; if ($pid == 0) { - my @diff_tree = qw(git-diff-tree -z -r -C); + my @diff_tree = qw(git-diff-tree -z -r); + if ($_cp_similarity) { + push @diff_tree, "-C$_cp_similarity"; + } else { + push @diff_tree, '-C'; + } push @diff_tree, '--find-copies-harder' if $_find_copies_harder; push @diff_tree, "-l$_l" if defined $_l; exec(@diff_tree, $from, $treeish) or croak $!; |