Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Git/FastExport.pm
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ sub next_block {
$block->{data} = <$fh>;
}
else {
$block->{data} = "";
$block->{data} = '';
}
}
}
Expand Down
9 changes: 5 additions & 4 deletions lib/Git/FastExport/Stitch.pm
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,11 @@ sub stitch {
$r = Git::Repository->new();
chdir $orig or croak "Can't chdir back to $orig: $!";
}
else { die "Undefined repository path" }
else { croak "Undefined repository path" }
$r;
};
$@ =~ s/ at .*\z//s, croak $@ if !$export;
$@ =~ s/ at .*\z//s;
croak $@ if !$export;

# do not stich a repo with itself
$repo = $export->git_dir;
Expand Down Expand Up @@ -174,7 +175,7 @@ sub next_block {
push @{ $parents->{ $node->{repo} } }, $parent;
}
else { # record the parents from the other repositories
for my $repo ( grep $_ ne $node->{repo},
for my $repo ( grep { $_ ne $node->{repo} }
keys %{ $commits->{$parent}{parents} } )
{
push @{ $parents->{$repo} },
Expand Down Expand Up @@ -275,7 +276,7 @@ sub _last_alien_child {
my %pparents;
@{pparents}{ @{ $peer->{parents}{ $peer->{repo} } || [] } } = ();
next
if grep !exists $pparents{$_},
if grep { !exists $pparents{$_} }
@{ $parents->{ $peer->{repo} } };

# this child node has a valid parent list
Expand Down