projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin).
[git.git]
/
git-cvsimport.perl
diff --git
a/git-cvsimport.perl
b/git-cvsimport.perl
index
3728294
..
8c707f2
100755
(executable)
--- a/
git-cvsimport.perl
+++ b/
git-cvsimport.perl
@@
-350,7
+350,7
@@
sub _line {
return $res;
} elsif($line =~ s/^E //) {
# print STDERR "S: $line\n";
return $res;
} elsif($line =~ s/^E //) {
# print STDERR "S: $line\n";
- } elsif($line =~ /^
Remove-entry
/i) {
+ } elsif($line =~ /^
(Remove-entry|Removed)
/i) {
$line = $self->readline(); # filename
$line = $self->readline(); # OK
chomp $line;
$line = $self->readline(); # filename
$line = $self->readline(); # OK
chomp $line;
@@
-677,11
+677,7
@@
my $commit = sub {
waitpid($pid,0);
die "Error running git-commit-tree: $?\n" if $?;
waitpid($pid,0);
die "Error running git-commit-tree: $?\n" if $?;
- open(C,">$git_dir/refs/heads/$branch")
- or die "Cannot open branch $branch for update: $!\n";
- print C "$cid\n"
- or die "Cannot write branch $branch for update: $!\n";
- close(C)
+ system("git-update-ref refs/heads/$branch $cid") == 0
or die "Cannot write branch $branch for update: $!\n";
if($tag) {
or die "Cannot write branch $branch for update: $!\n";
if($tag) {