From: Junio C Hamano <junkio@cox.net>
Date: Mon, 20 Feb 2006 05:14:56 +0000 (-0800)
Subject: fmt-merge-msg: do not add excess newline at the end.
X-Git-Tag: v1.3.0-rc1~189^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a15f43312f6962959e8daa33df0cf5357852a4b8;p=git.git

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

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

diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl
index 616bb521c..c34ddc5d5 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";