@matheusbsbs / matheus-bagliano / commits / 2a86ec46da
Fork 0

fmt-merge-msg: avoid open "-|" list form for Perl 5.6

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Feb 20, 2006 at 14:02 UTC 2a86ec46da99e4cd5e6e394d378ba119d8f5069d
1 file changed +16 -8
git-fmt-merge-msg.perl
+16 -8
@@ -28,11 +28,12 @@ sub andjoin {
28 }
29
30 sub repoconfig {
31 - my $fh;
31 my $val;
32 eval {
34 - open $fh, '-|', 'git-repo-config', '--get', 'merge.summary'
35 - or die "$!";
33 + my $pid = open(my $fh, '-|');
34 + if (!$pid) {
35 + exec('git-repo-config', '--get', 'merge.summary');
36 + }
37 ($val) = <$fh>;
38 close $fh;
39 };
@@ -41,25 +42,32 @@ sub repoconfig {
42
43 sub current_branch {
44 my $fh;
44 - open $fh, '-|', 'git-symbolic-ref', 'HEAD' or die "$!";
45 + my $pid = open($fh, '-|');
46 + die "$!" unless defined $pid;
47 + if (!$pid) {
48 + exec('git-symbolic-ref', 'HEAD') or die "$!";
49 + }
50 my ($bra) = <$fh>;
51 chomp($bra);
52 + close $fh or die "$!";
53 $bra =~ s|^refs/heads/||;
54 if ($bra ne 'master') {
55 $bra = " into $bra";
56 } else {
57 $bra = "";
58 }
53 -
59 return $bra;
60 }
61
62 sub shortlog {
63 my ($tip, $limit) = @_;
64 my ($fh, @result);
60 - open $fh, '-|', ('git-log', "--max-count=$limit", '--topo-order',
61 - '--pretty=oneline', $tip, '^HEAD')
62 - or die "$!";
65 + my $pid = open($fh, '-|');
66 + die "$!" unless defined $pid;
67 + if (!$pid) {
68 + exec('git-log', "--max-count=$limit", '--topo-order',
69 + '--pretty=oneline', $tip, '^HEAD') or die "$!";
70 + }
71 while (<$fh>) {
72 s/^[0-9a-f]{40}\s+//;
73 push @result, $_;