diff options
Diffstat (limited to 'git-fmt-merge-msg.perl')
| -rwxr-xr-x | git-fmt-merge-msg.perl | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl index 5986e5414..be2a48cf6 100755 --- a/git-fmt-merge-msg.perl +++ b/git-fmt-merge-msg.perl @@ -6,6 +6,9 @@ # by grouping branches and tags together to form a single line. use strict; +use Git; + +my $repo = Git->repository(); my @src; my %src; @@ -28,13 +31,12 @@ sub andjoin { } sub repoconfig { - my ($val) = qx{git-repo-config --get merge.summary}; + my ($val) = $repo->command_oneline('repo-config', '--get', 'merge.summary'); return $val; } sub current_branch { - my ($bra) = qx{git-symbolic-ref HEAD}; - chomp($bra); + my ($bra) = $repo->command_oneline('symbolic-ref', 'HEAD'); $bra =~ s|^refs/heads/||; if ($bra ne 'master') { $bra = " into $bra"; @@ -47,11 +49,10 @@ sub current_branch { sub shortlog { my ($tip) = @_; my @result; - foreach ( qx{git-log --no-merges --topo-order --pretty=oneline $tip ^HEAD} ) { + foreach ($repo->command('log', '--no-merges', '--topo-order', '--pretty=oneline', $tip, '^HEAD')) { s/^[0-9a-f]{40}\s+//; push @result, $_; } - die "git-log failed\n" if $?; return @result; } @@ -168,6 +169,6 @@ for (@origin) { print " ...\n"; last; } - print " $log"; + print " $log\n"; } } |