From: Junio C Hamano <junkio@cox.net>
Date: Mon, 20 Feb 2006 05:17:06 +0000 (-0800)
Subject: Merge branch 'jc/merge-msg' into next
X-Git-Tag: v1.3.0-rc1~54^2~56
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=2e12a089ff1e011689f609aa1a687050a9de2ee4;hp=0d27c3f699eb4d9268449a867901c8cc5f36efd6;p=git.git

Merge branch 'jc/merge-msg' into next

* jc/merge-msg:
  fmt-merge-msg: do not add excess newline at the end.
---

diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl
index 616bb521..c34ddc5d 100755
--- a/git-fmt-merge-msg.perl
+++ b/git-fmt-merge-msg.perl
@@ -43,6 +43,7 @@ sub current_branch {
 	my $fh;
 	open $fh, '-|', 'git-symbolic-ref', 'HEAD' or die "$!";
 	my ($bra) = <$fh>;
+	chomp($bra);
 	$bra =~ s|^refs/heads/||;
 	if ($bra ne 'master') {
 		$bra = " into $bra";