mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'svn' of http://netz.smurf.noris.de/git/git

Browse Source 
[jc: I have my pre-commit hook enabled to catch trailing whitespaces,
 and fixed them up while merging.]

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2005-10-16 11:55:35 -07:00
parent 6abf5c0c6f 40dad96e41
commit 29504118f8
5 changed files with 859 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git-cvsimport.perl
View File

@ -570,6 +570,7 @@ my $commit = sub {
unless($pid) {
$pr->writer();
$pw->reader();
open(OUT,">&STDOUT");
dup2($pw->fileno(),0);
dup2($pr->fileno(),1);
$pr->close();
@ -587,10 +588,9 @@ my $commit = sub {
if ( -e "$git_dir/refs/heads/$mparent") {
$mparent = get_headref($mparent, $git_dir);
push @par, '-p', $mparent;
# printing here breaks import #
# # print "Merge parent branch: $mparent\n" if $opt_v;
print OUT "Merge parent branch: $mparent\n" if $opt_v;
}
}
}
}
exec("env",