Merge branch 'jc/merge-msg' into next

* jc/merge-msg: fmt-merge-msg: do not add excess newline at the end.
git-mirror · Feb 20, 2006 · 2e12a08 · 2e12a08
2 parents 0d27c3f + a15f433
commit 2e12a08
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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";