From cb9594e28c940d2bbf4d7fb69c337d27155da37a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 18 Mar 2006 02:05:02 -0800 Subject: 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 --- git-cvsimport.perl | 1 + 1 file changed, 1 insertion(+) diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 6c0f5d2938..3728294e74 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); -- cgit v1.2.3