projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix filename scaling for binary files
[git.git]
/
git-cvsimport.perl
diff --git
a/git-cvsimport.perl
b/git-cvsimport.perl
index
6c0f5d2
..
c0ae00b
100755
(executable)
--- a/
git-cvsimport.perl
+++ b/
git-cvsimport.perl
@@
-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) {
@@
-881,6
+877,7
@@
if($orig_branch) {
}
my $tip_at_end = `git-rev-parse --verify HEAD`;
if ($tip_at_start ne $tip_at_end) {
}
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);
print "Fetched into the current branch.\n" if $opt_v;
system(qw(git-read-tree -u -m),
$tip_at_start, $tip_at_end);