Skip to content

Commit

Permalink
cvsimport: fix reading from rev-parse
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Mar 18, 2006
1 parent 8a5f2ea commit cb9594e
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions git-cvsimport.perl
Original file line number Diff line number Diff line change
Expand Up @@ -881,6 +881,7 @@ ($$)
}
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);
Expand Down

0 comments on commit cb9594e

Please sign in to comment.