From: Junio C Hamano <junkio@cox.net>
Date: Sat, 18 Mar 2006 10:05:02 +0000 (-0800)
Subject: cvsimport: fix reading from rev-parse
X-Git-Tag: v1.3.0-rc1~21^2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=cb9594e28c940d2bbf4d7fb69c337d27155da37a;p=git.git

cvsimport: fix reading from rev-parse

The updated code reads the tip of the current branch before and
after the import runs, but forgot to chomp what we read from the
command.  The read-tree command did not them with the trailing
LF.

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

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 6c0f5d29..3728294e 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -881,6 +881,7 @@ if($orig_branch) {
 	}
 	my $tip_at_end = `git-rev-parse --verify HEAD`;
 	if ($tip_at_start ne $tip_at_end) {
+		for ($tip_at_start, $tip_at_end) { chomp; }
 		print "Fetched into the current branch.\n" if $opt_v;
 		system(qw(git-read-tree -u -m),
 		       $tip_at_start, $tip_at_end);