mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-28 08:49:45 +02:00
Code

cvsimport: report merge parents

Browse Source 
Matching and reporting merge parents happens in a subprocess.
Re-open stdout before redirecting stdout to the pipe, so that printing
verbose messages doesn't go to the wrong place.

Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
This commit is contained in:
Matthias Urlichs 2005-10-10 11:15:09 +02:00
parent 3ff8cbeda6
commit 89764f5d8b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-cvsimport.perl
View File

@ -567,6 +567,7 @@ my $commit = sub {
unless($pid) {
$pr->writer();
$pw->reader();
open(OUT,">&STDOUT");
dup2($pw->fileno(),0);
dup2($pr->fileno(),1);
$pr->close();
@ -584,10 +585,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",