Merge branch 'jc/merge-msg' into next

* jc/merge-msg:
  fmt-merge-msg: do not add excess newline at the end.
maint
Junio C Hamano 2006-02-19 21:17:06 -08:00
commit 2e12a089ff
1 changed files with 1 additions and 0 deletions

View File

@ -43,6 +43,7 @@ sub current_branch {
my $fh; my $fh;
open $fh, '-|', 'git-symbolic-ref', 'HEAD' or die "$!"; open $fh, '-|', 'git-symbolic-ref', 'HEAD' or die "$!";
my ($bra) = <$fh>; my ($bra) = <$fh>;
chomp($bra);
$bra =~ s|^refs/heads/||; $bra =~ s|^refs/heads/||;
if ($bra ne 'master') { if ($bra ne 'master') {
$bra = " into $bra"; $bra = " into $bra";