diff options
| -rwxr-xr-x | git-svn.perl | 1 | ||||
| -rwxr-xr-x | t/t9124-git-svn-dcommit-auto-props.sh | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl index 2cc6487..ee3f5ed 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -3657,6 +3657,7 @@ sub R { my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat, $self->url_path($m->{file_a}), $self->{r}); print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q; + $self->apply_autoprops($file, $fbat); $self->chg_file($fbat, $m); $self->close_file($fbat,undef,$self->{pool}); diff --git a/t/t9124-git-svn-dcommit-auto-props.sh b/t/t9124-git-svn-dcommit-auto-props.sh index 54276bf..31193a3 100755 --- a/t/t9124-git-svn-dcommit-auto-props.sh +++ b/t/t9124-git-svn-dcommit-auto-props.sh @@ -81,4 +81,21 @@ test_expect_success 'check resulting svn repository' ' ) ' +test_expect_success 'check renamed file' ' + test -d user && + generate_auto_props yes > user/config && + git mv foo foo.sh && + git commit -m "foo => foo.sh" && + git svn dcommit --config-dir=user && + ( + cd work/svnrepo && + svn up && + test ! -e foo && + test -e foo.sh && + test "x$(svn propget svn:mime-type foo.sh)" = \ + "xapplication/x-shellscript" && + test "x$(svn propget svn:eol-style foo.sh)" = "xLF" + ) +' + test_done |