зеркало из https://github.com/microsoft/git.git
archimport: Fix a bug I introduced in the new log parser
This fixes the case (that worked originally in Martin's version) where the only new/modified files are Arch control files. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
This commit is contained in:
Родитель
3e525e6738
Коммит
6e33101abd
|
@ -790,7 +790,7 @@ sub parselog {
|
||||||
# skip Arch control files, unescape pika-escaped files
|
# skip Arch control files, unescape pika-escaped files
|
||||||
foreach my $k (keys %want_headers) {
|
foreach my $k (keys %want_headers) {
|
||||||
next unless (defined $ps->{$k});
|
next unless (defined $ps->{$k});
|
||||||
my @tmp;
|
my @tmp = ();
|
||||||
foreach my $t (@{$ps->{$k}}) {
|
foreach my $t (@{$ps->{$k}}) {
|
||||||
next unless length ($t);
|
next unless length ($t);
|
||||||
next if $t =~ m!\{arch\}/!;
|
next if $t =~ m!\{arch\}/!;
|
||||||
|
@ -804,7 +804,7 @@ sub parselog {
|
||||||
}
|
}
|
||||||
push @tmp, $t;
|
push @tmp, $t;
|
||||||
}
|
}
|
||||||
$ps->{$k} = \@tmp if scalar @tmp;
|
$ps->{$k} = \@tmp;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче