summaryrefslogtreecommitdiff
path: root/git-fmt-merge-msg.perl
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-20 05:14:56 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-20 05:14:56 (GMT)
commita15f43312f6962959e8daa33df0cf5357852a4b8 (patch)
tree69979d1f4bd486f162b5b11c84a567542888791b /git-fmt-merge-msg.perl
parent2b020455f92ea3c20a78005dd19e7a127bb5b481 (diff)
downloadgit-a15f43312f6962959e8daa33df0cf5357852a4b8.zip
git-a15f43312f6962959e8daa33df0cf5357852a4b8.tar.gz
git-a15f43312f6962959e8daa33df0cf5357852a4b8.tar.bz2
fmt-merge-msg: do not add excess newline at the end.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-fmt-merge-msg.perl')
-rwxr-xr-xgit-fmt-merge-msg.perl1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl
index 616bb52..c34ddc5 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";