microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge git://git.bogomips.org/git-svn 

* git://git.bogomips.org/git-svn:
  git-svn: workaround for a bug in svn serf backend
This commit is contained in:
Junio C Hamano 2013-12-27 14:58:35 -08:00
Родитель 36ec9e2173 2394e94e83
Коммит 53f3478d42
1 изменённых файлов: 8 добавлений и 2 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
perl/Git/SVN/Editor.pm
Просмотреть файл

@ -304,8 +304,12 @@ sub C {
my ($self, $m, $deletions) = @_; my ($self, $m, $deletions) = @_;
my ($dir, $file) = split_path($m->{file_b}); my ($dir, $file) = split_path($m->{file_b});
my $pbat = $self->ensure_path($dir, $deletions); my $pbat = $self->ensure_path($dir, $deletions);
# workaround for a bug in svn serf backend (v1.8.5 and below):
# store third argument to ->add_file() in a local variable, to make it
# have the same lifetime as $fbat
my $upa = $self->url_path($m->{file_a});
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}); $upa, $self->{r});
print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q; print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
$self->chg_file($fbat, $m); $self->chg_file($fbat, $m);
$self->close_file($fbat,undef,$self->{pool}); $self->close_file($fbat,undef,$self->{pool});
@ -323,8 +327,10 @@ sub R {
my ($self, $m, $deletions) = @_; my ($self, $m, $deletions) = @_;
my ($dir, $file) = split_path($m->{file_b}); my ($dir, $file) = split_path($m->{file_b});
my $pbat = $self->ensure_path($dir, $deletions); my $pbat = $self->ensure_path($dir, $deletions);
# workaround for a bug in svn serf backend, see comment in C() above
my $upa = $self->url_path($m->{file_a});
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}); $upa, $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->apply_autoprops($file, $fbat);
$self->chg_file($fbat, $m); $self->chg_file($fbat, $m);