Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
cvsimport: fix reading from rev-parse
author
Junio C Hamano
<junkio@cox.net>
Sat, 18 Mar 2006 10:05:02 +0000
(
02:05
-0800)
committer
Junio C Hamano
<junkio@cox.net>
Sat, 18 Mar 2006 10:05:02 +0000
(
02:05
-0800)
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>
git-cvsimport.perl
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
8a5f2ea
)
diff --git
a/git-cvsimport.perl
b/git-cvsimport.perl
index 6c0f5d29380015fb4fb2c2948bb367e8d493e793..3728294e740b466b97f623302ddd89fab1ba0e92 100755
(executable)
--- a/
git-cvsimport.perl
+++ b/
git-cvsimport.perl
@@
-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);