summaryrefslogtreecommitdiff
path: root/git-cvsimport.perl
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-18 02:05:02 -0800
committerJunio C Hamano <junkio@cox.net>2006-03-18 02:05:02 -0800
commitcb9594e28c940d2bbf4d7fb69c337d27155da37a (patch)
treebb0fda60bfcd12ea5d017d4d953f289f9d891db5 /git-cvsimport.perl
parent8a5f2eac5271ba1efed353c0c0a992d6471a8d05 (diff)
downloadgit-cb9594e28c940d2bbf4d7fb69c337d27155da37a.tar.gz
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>
Diffstat (limited to 'git-cvsimport.perl')
-rwxr-xr-xgit-cvsimport.perl1
1 files changed, 1 insertions, 0 deletions
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);