kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git-svn: set auto_props when renaming files 

Patch-by: Paul Talacko <gnuruandstuff@yahoo.co.uk>:
<http://article.gmane.org/gmane.comp.version-control.git/95006>
> Hello,
>
> There's an issue in git-svn as autoprops are not applied to
> renamed files, only to added files.
>
> This patch fixes the bug.

[ew: added test case]
Signed-off-by: Eric Wong <normalperson@yhbt.net>
maint
Paul Talacko 2008-09-06 18:50:38 -07:00 committed by Eric Wong
parent a786091b4a
commit 7c4d0219cf
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git-svn.perl
View File

@ -3657,6 +3657,7 @@ sub R {
my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat, my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
$self->url_path($m->{file_a}), $self->{r}); $self->url_path($m->{file_a}), $self->{r});
print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q; print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
$self->apply_autoprops($file, $fbat);
$self->chg_file($fbat, $m); $self->chg_file($fbat, $m);
$self->close_file($fbat,undef,$self->{pool}); $self->close_file($fbat,undef,$self->{pool});



17
t/t9124-git-svn-dcommit-auto-props.sh
View File

@ -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 test_done